Rename build variable to be more clear

Author: mallardduck

.github/workflows/e2e-ci.yaml

@@ -86,7 +86,7 @@ jobs:
       -
         name: Perform pre-e2e image build
         run: |
-          CHART_VERSION=0.3.4 REPO=${REPO} TAG=${TAG} make build;
+          EMBEDED_CHART_VERSION=0.3.4 REPO=${REPO} TAG=${TAG} make build;
           REPO=${REPO} TAG=${TAG} make package;
       -
         name : Install k3d

package/Dockerfile

@@ -21,10 +21,10 @@ FROM registry.suse.com/bci/golang:1.22 AS builder
 
 # Allow chart version config
 ARG TARGETPLATFORM
-ARG CHART_VERSION=0.3.4
+ARG EMBEDED_CHART_VERSION=0.3.4
 ARG TAG=''
 ARG REPO=''
-ENV CHART_VERSION=$CHART_VERSION TAG=$TAG REPO=$REPO
+ENV EMBEDED_CHART_VERSION=$EMBEDED_CHART_VERSION TAG=$TAG REPO=$REPO
 
 WORKDIR /usr/src/app
 COPY --from=helm ./helm/bin/helm /usr/local/bin/

scripts/build-chart

@@ -6,7 +6,7 @@ source $(dirname $0)/version
 cd $(dirname $0)/..
 
 CHART=${CHART:-rancher-project-monitoring}
-VERSION=${CHART_VERSION:-$(find ./charts/${CHART} -maxdepth 1 -mindepth 1 -type d | tr - \~ | sort -rV | tr \~ - | head -n1 | cut -d'/' -f4)}
+VERSION=${EMBEDED_CHART_VERSION:-$(find ./charts/${CHART} -maxdepth 1 -mindepth 1 -type d | tr - \~ | sort -rV | tr \~ - | head -n1 | cut -d'/' -f4)}
 
 helm package charts/${CHART}/${VERSION} --destination bin/${CHART}
 base64 -i bin/${CHART}/${CHART}-${VERSION}.tgz > bin/${CHART}/${CHART}.tgz.base64