Fix a global-variable problem

`TAG` and `IMAGE_TAG` are two different things.

Author: ericpromislow

.github/workflows/ci.yaml

@@ -50,12 +50,6 @@ jobs:
       - run : make ci
         name: ci
 
-#      - name: Build an image for integration testing
-#        run: ./scripts/package-for-ci
-#        env:
-#          ARCH: "${{ matrix.arch }}"
-#          SHA: "${{ github.sha }}"
-
       - name : install K3d
         run : ./.github/workflows/scripts/install-k3d.sh
 
@@ -77,9 +71,6 @@ jobs:
           RANCHER_IMAGE_TAG: "v2.9-head"
           VERSION: "2.9"
 
-      - name : debug show image_tag file
-        run : cat dist/image_tag
-
       - name : get vars
         run : cat dist/image_tag >> $GITHUB_ENV
 

.github/workflows/scripts/integration-test-ci

@@ -1,5 +1,5 @@
 #!/bin/bash
-set -eux
+set -eu
 
 cd $(dirname $0)/../../..
 DIST_DIR="$PWD"/dist
@@ -45,7 +45,7 @@ echo "Uploading new webhook image"
 
 # Install the webhook chart we just built.
 upgrade_rancher_webhook() {
-   helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_VERSION}.tgz -n cattle-system \
+   helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_CHART_VERSION}.tgz -n cattle-system \
     --wait --timeout=120s --set image.repository="${IMAGE_REPO}" --set image.tag="${IMAGE_TAG}" --reuse-values --debug
 }
 
@@ -68,7 +68,7 @@ set -e
 ./bin/rancher-webhook-integration.test -test.v -test.run IntegrationTest
 
 # Install the webhook chart with new ports.
-helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_VERSION}.tgz -n cattle-system \
+helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_CHART_VERSION}.tgz -n cattle-system \
     --wait --reuse-values --set port=443
 
 # Test that the ports are set as expected and run a single integration test to verify the webhook is still accessible.

scripts/integration-test

@@ -35,15 +35,15 @@ source ./dist/tags
 
 # Install the webhook chart we just built.
 upgrade_rancher_webhook() {
-   helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_VERSION}.tgz -n cattle-system \
+   helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_CHART_VERSION}.tgz -n cattle-system \
     --wait --set image.repository="${IMAGE_REPO}" --set image.tag="${IMAGE_TAG}" --reuse-values --debug
 }
 try --delay 2 --max 4 --failmsg "Couldn't helm upgrade rancher-webhook" upgrade_rancher_webhook
 
 ./bin/rancher-webhook-integration.test -test.v -test.run IntegrationTest
 
 # Install the webhook chart with new ports.
-helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_VERSION}.tgz -n cattle-system \
+helm upgrade rancher-webhook ./dist/artifacts/rancher-webhook-${HELM_CHART_VERSION}.tgz -n cattle-system \
     --wait --reuse-values --set port=443
 
 # Test that the ports are set as expected and run a single integration test to verify the webhook is still accessible.

scripts/package

@@ -3,8 +3,6 @@ set -eu
 
 source $(dirname $0)/version
 
-set -x
-
 cd $(dirname $0)/..
 
 echo Running package

scripts/package-for-ci

@@ -8,9 +8,6 @@ fi
 
 source $(dirname $0)/version
 
-set -x
-
-echo "QQQ: scripts/package: SHA is ${SHA}"
 REPO=rancher
 IMAGE=${REPO}/webhook:${TAG}
 docker tag ${IMAGE} "${REPO}/webhook:${SHA}"

scripts/package-helm

@@ -12,8 +12,8 @@ cp -rf charts build/
 
 # must use sed -i'<backup_extension>'` for GNU and OSX compatibility
 sed -i'.bkp' \
-    -e 's/^version:.*/version: '${HELM_VERSION}'/' \
-    -e 's/appVersion:.*/appVersion: '${HELM_VERSION}'/' \
+    -e 's/^version:.*/version: '${HELM_CHART_VERSION}'/' \
+    -e 's/appVersion:.*/appVersion: '${HELM_CHART_VERSION}'/' \
     build/charts/rancher-webhook/Chart.yaml
 
 sed -i'.bkb' \

scripts/test-helm

@@ -2,7 +2,6 @@
 set -e
 cd $(dirname $0)/..
 
-./scripts/package-helm
 echo Running helm lint
 helm lint ./charts/rancher-webhook
 # Check for unittest plugin

scripts/version

@@ -21,16 +21,16 @@ fi
 SUFFIX="-${ARCH}"
 
 HELM_TAG="${HELM_TAG:-${TAG:-${VERSION}}}"
-HELM_VERSION="${HELM_VERSION:-${HELM_TAG/v/}}"
+HELM_CHART_VERSION="${HELM_CHART_VERSION:-${HELM_TAG/v/}}"
 TAG="${TAG:-${VERSION}${SUFFIX}}"
 REPO="${REPO:-rancher}"
 
 if echo $TAG | grep -q dirty; then
     TAG=dev
     HELM_TAG=dev
-    HELM_VERSION=0.0.0-dev
+    HELM_CHART_VERSION=0.0.0-dev
 fi
 
 DIST_DIR="${DIST_DIR:-$(dirname $0)/../dist/}"
 mkdir -p ${DIST_DIR}
-echo "export TAG=${TAG}; export HELM_TAG=${HELM_TAG}; export HELM_VERSION=${HELM_VERSION};" >${DIST_DIR}/tags
+echo "export TAG=${TAG}; export HELM_TAG=${HELM_TAG}; export HELM_CHART_VERSION=${HELM_CHART_VERSION};" >${DIST_DIR}/tags