Ensure method to override rancher project monitoring version still works

rancher · Jan 28, 2025 · 23d0064 · 23d0064
1 parent 5197c6f
commit 23d0064
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/prom-fed-e2e-ci.yaml b/.github/workflows/prom-fed-e2e-ci.yaml
@@ -98,7 +98,7 @@ jobs:
       -
         name: Perform pre-e2e image build
         run: |
-          EMBEDED_CHART_VERSION=0.3.4 REPO=${REPO} TAG=${TAG} make build;
+          REPO=${REPO} TAG=${TAG} make build;
           REPO=${REPO} TAG=${TAG} make package;
       -
         name : Install k3d

diff --git a/package/Dockerfile-prometheus-federator b/package/Dockerfile-prometheus-federator
@@ -21,10 +21,10 @@ FROM registry.suse.com/bci/golang:1.22 AS builder
 
 # Allow chart version config
 ARG TARGETPLATFORM
-ARG EMBEDDED_CHART_VERSION=0.3.4
+ARG RANCHER_PROJECT_MONITORING=''
 ARG TAG=''
 ARG REPO=''
-ENV EMBEDDED_CHART_VERSION=$EMBEDDED_CHART_VERSION TAG=$TAG REPO=$REPO
+ENV RANCHER_PROJECT_MONITORING=$RANCHER_PROJECT_MONITORING TAG=$TAG REPO=$REPO
 
 WORKDIR /usr/src/app
 COPY --from=helm ./helm/bin/helm /usr/local/bin/

diff --git a/scripts/package b/scripts/package
@@ -12,9 +12,9 @@ DOCKERFILE=package/Dockerfile${DOCKER_TARGET}
 echo "Building \`${IMAGE}\` from \`${DOCKERFILE}\`:";
 
 if [[ ${USE_DOCKER_BUILDX} -eq 1 ]]; then
-  docker buildx build --platform linux/amd64,linux/arm64 -f "${DOCKERFILE}" . -t "${IMAGE}"
+  docker buildx build --platform linux/amd64,linux/arm64 -f "${DOCKERFILE}" --build-arg RANCHER_PROJECT_MONITORING=$RANCHER_PROJECT_MONITORING -t "${IMAGE}" .
 else
-  docker build -f "${DOCKERFILE}" -t "${IMAGE}" .
+  docker build -f "${DOCKERFILE}" --build-arg RANCHER_PROJECT_MONITORING=$RANCHER_PROJECT_MONITORING -t "${IMAGE}" .
 fi
 
 echo "Completed building ${IMAGE} container image"