Signed-off-by: Kushal Shukla <[email protected]>

Key changes
1. removed multiline command and put it in script on prometheus-builder image.
2. configure this in prometheus deployment.
3. added download.sh script which will download the data if key present , else
skip the downloading process and move to next container.

Author: kushalShukla-web

prombench/manifests/prombench/benchmark/3b_prometheus-test_deployment.yaml

@@ -44,7 +44,7 @@ spec:
         - name: GITHUB_ORG
           value: "{{ .GITHUB_ORG }}"
         - name: GITHUB_REPO
-          value: "{{ .GITHUB_REPO }}"     
+          value: "{{ .GITHUB_REPO }}"
         volumeMounts:
         - name: prometheus-executable
           mountPath: /prometheus-builder
@@ -66,13 +66,7 @@ spec:
         - name: s3-config
           mountPath: /config
         - name: key
-          mountPath: /key 
-        args: [
-          "download",
-        "--tsdb-path=/data", 
-        "--objstore.config-file=/config/object-config.yml",
-        "--key=/key/key.yml"
-        ]  
+          mountPath: /key
       containers:
       - name: prometheus
         image: quay.io/prometheus/busybox:latest
@@ -117,7 +111,7 @@ spec:
         secret:
           secretName: s3-secret
       - name: key
-        emptyDir: {}               
+        emptyDir: {}                  
       terminationGracePeriodSeconds: 300
       nodeSelector:
         node-name: prometheus-{{ .PR_NUMBER }}
@@ -175,19 +169,17 @@ spec:
       securityContext:
         runAsUser: 0
       initContainers:
-      - name: git-fetcher
-        image: alpine/git
-        command:
-          - /bin/sh
-          - -c
-          - |
-            apk add --no-cache bash && \
-            git clone --depth 1 https://github.com/{{ .GITHUB_ORG }}/{{ .GITHUB_REPO }}.git /repo1 && \
-            cd /repo1 && \
-            git fetch origin pull/{{ .PR_NUMBER }}/head:pr-branch && \
-            git checkout pr-branch && \
-            cp  key.yml /config/key.yml && \
-            rm -rf /repo1
+      - name: download-key
+        image: kushalshukla/builder
+        imagePullPolicy: Always
+        command: [ "/download-key/key.sh" ]
+        env:
+        - name: PR_NUMBER
+          value: "{{ .PR_NUMBER }}"
+        - name: GITHUB_ORG
+          value: "{{ .GITHUB_ORG }}"
+        - name: GITHUB_REPO
+          value: "{{ .GITHUB_REPO }}"          
         volumeMounts:
         - name: key
           mountPath: /config
@@ -207,13 +199,7 @@ spec:
         - name: s3-config
           mountPath: /config
         - name: key
-          mountPath: /key                                               
-        args: [
-          "download",
-        "--tsdb-path=/data", 
-        "--objstore.config-file=/config/object-config.yml",
-        "--key=/key/key.yml"
-        ]            
+          mountPath: /key            
       containers:
       - name: prometheus
         image: quay.io/prometheus/prometheus:{{ .RELEASE }}

tools/block-sync/Dockerfile

@@ -5,6 +5,12 @@ RUN apk --no-cache add libc6-compat
 
 COPY ./block-sync /bin/block-sync
 
+# Copy the download.sh script into the container's /scripts directory
+COPY ./download.sh /scripts/download.sh
+
+# Ensure that the download.sh script is executable
+RUN chmod +x /scripts/download.sh
+
 RUN chmod +x /bin/block-sync
 
-ENTRYPOINT ["/bin/block-sync"]
+ENTRYPOINT [ "/scripts/download.sh" ]

tools/block-sync/download.sh

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+KEY_FILE="/key/key.yml"
+
+if [[ -f "$KEY_FILE" ]]; then
+    echo "Found key.yml, proceeding with download..."
+    /bin/block-sync download --tsdb-path=/data --objstore.config-file=/config/object-config.yml --key=$KEY_FILE
+else
+    echo "key.yml not found, skipping download."
+    exit 0
+fi

tools/prometheus-builder/Dockerfile

@@ -4,6 +4,8 @@ RUN mkdir -p /go/src/github.com
 
 COPY ./build.sh /go/src/github.com/build.sh
 
+COPY ./key.sh /download-key/key.sh
+
 RUN chmod +x /go/src/github.com/build.sh
 
 ENTRYPOINT ["/go/src/github.com/build.sh"]

tools/prometheus-builder/build.sh

@@ -5,7 +5,8 @@ DIR="/go/src/github.com/prometheus/prometheus"
 if [[ -z $PR_NUMBER || -z $VOLUME_DIR || -z $GITHUB_ORG || -z $GITHUB_REPO ]]; then
     echo "ERROR:: environment variables not set correctly"
     exit 1;
-fi 
+fi
+ 
 # Clone the repository with a shallow clone
 echo ">> Cloning repository $GITHUB_ORG/$GITHUB_REPO (shallow clone)"
 if ! git clone --depth 1 https://github.com/$GITHUB_ORG/$GITHUB_REPO.git $DIR; then
@@ -23,8 +24,16 @@ fi
 
 git checkout pr-branch
 
+# Here, MKDIR is specified in the volumeMount section of the prometheus-builder init container, 
+# where it will copy the key.yml file from the Prometheus directory to the volume section of the
+# emptyDir. This file will later be used by the data-downloader init container.
 MKDIR="/config"
-cp  "$DIR/key.yml" "$MKDIR/key.yml"
+if [ -f "$DIR/key.yml" ]; then
+    echo "File exists."
+    cp  "$DIR/key.yml" "$MKDIR/key.yml"
+else
+    echo "File does not exist."
+fi
 
 echo ">> Creating prometheus binaries"
 if ! make build PROMU_BINARIES="prometheus"; then
@@ -33,4 +42,4 @@ if ! make build PROMU_BINARIES="prometheus"; then
 fi
 
 echo ">> Copy files to volume"
-cp prometheus               $VOLUME_DIR/prometheus
+cp prometheus               $VOLUME_DIR/prometheus

tools/prometheus-builder/key.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+
+DIR="/go/src/github.com/prometheus/prometheus"
+
+if [[ -z $PR_NUMBER || -z $GITHUB_ORG || -z $GITHUB_REPO ]]; then
+    echo "ERROR:: environment variables not set correctly"
+    exit 1;
+fi 
+# Clone the repository with a shallow clone
+echo ">> Cloning repository $GITHUB_ORG/$GITHUB_REPO (shallow clone)"
+if ! git clone --depth 1 https://github.com/$GITHUB_ORG/$GITHUB_REPO.git $DIR; then
+    echo "ERROR:: Cloning of repo $GITHUB_ORG/$GITHUB_REPO failed"
+    exit 1;
+fi
+
+cd $DIR || exit 1
+
+echo ">> Fetching Pull Request $GITHUB_ORG/$GITHUB_REPO/pull/$PR_NUMBER"
+if ! git fetch origin pull/$PR_NUMBER/head:pr-branch; then
+    echo "ERROR:: Fetching of PR $PR_NUMBER failed"
+    exit 1;
+fi
+
+git checkout pr-branch
+
+# Here, MKDIR is specified in the volumeMount section of the download-key init container, where it 
+# will copy the key.yml file from the Prometheus directory to the volume section of the emptyDir. 
+# This file will later be used by the data-downloader init container.
+MKDIR="/config"
+if [ -f "$DIR/key.yml" ]; then
+    echo "File exists."
+    cp  "$DIR/key.yml" "$MKDIR/key.yml"
+else
+    echo "File does not exist."
+fi