Fix build issues

scripts/deploy

@@ -182,10 +182,10 @@ deploy_backup_restore() {
         -n cattle-resources-system \
         rancher-backup rancher-charts/rancher-backup
   else
-    helm install --wait --create-namespace -n cattle-resources-system rancher-backup-crd dist/artifacts/rancher-backup-crd-"${HELM_VERSION_DEV}".tgz
-    helm install --wait -n cattle-resources-system rancher-backup dist/artifacts/rancher-backup-"${HELM_VERSION_DEV}".tgz \
+    helm install --wait --create-namespace -n cattle-resources-system rancher-backup-crd dist/artifacts/rancher-backup-crd-"${HELM_CHART_VERSION}".tgz
+    helm install --wait -n cattle-resources-system rancher-backup dist/artifacts/rancher-backup-"${HELM_CHART_VERSION}".tgz \
         --set image.tag="${TAG}" \
-        --set image.repository=${DOCKERHUB_USER}/backup-restore-operator \
+        --set image.repository=${REPO}/backup-restore-operator \
         --set imagePullPolicy=IfNotPresent
   fi
 }

scripts/integration

@@ -13,14 +13,6 @@ echo_with_time "INFO - Running $0"
 
 ls -la ./dist/artifacts
 
-# In case short commit only consists of numbers, it is regarded valid by Helm when packaging
-# Or if a tag is set (if its a (pre) release)
-if [[ $HELM_VERSION =~ ^[0-9]+$ ]] || [[ -n $GIT_TAG ]]; then
-  HELM_CHART_VERSION=$HELM_VERSION
-else
-  HELM_CHART_VERSION=$HELM_VERSION_DEV
-fi
-
 helm install rancher-backup-crd ./dist/artifacts/rancher-backup-crd-$HELM_CHART_VERSION.tgz -n cattle-resources-system --create-namespace --wait
 helm install rancher-backup ./dist/artifacts/rancher-backup-$HELM_CHART_VERSION.tgz -n cattle-resources-system --set image.tag=$TAG --set imagePullPolicy=IfNotPresent
 

scripts/package-helm

@@ -35,10 +35,8 @@ rm -rf build/charts
 mkdir -p build dist/artifacts
 cp -rf charts build/
 
-edit-charts ${HELM_VERSION} ${HELM_TAG}
+edit-charts ${HELM_CHART_VERSION} ${HELM_IMAGE_TAG}
 
 if ! package-charts; then
-    echo "package-chart or package-chart-crd failed: trying with dev variable..."
-    edit-charts ${HELM_VERSION_DEV} ${HELM_TAG_DEV}
-    package-charts
+    echo "Packaging the BRO charts failed!"
 fi

scripts/testenv

@@ -5,4 +5,4 @@ set -x
 source $(dirname $0)/version
 
 CLUSTER_NAME=$CLUSTER_NAME K3S_VERSION=$K3S_VERSION ./.github/workflows/scripts/setup-cluster.sh
-helm install rancher-backup-crd ./dist/artifacts/rancher-backup-crd-$HELM_VERSION_DEV.tgz -n cattle-resources-system --create-namespace --wait
+helm install rancher-backup-crd ./dist/artifacts/rancher-backup-crd-$HELM_CHART_VERSION.tgz -n cattle-resources-system --create-namespace --wait

scripts/version

@@ -1,5 +1,4 @@
 #!/bin/bash
-set -x
 
 if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
     DIRTY="-dirty"
@@ -19,16 +18,28 @@ if [ -z "$ARCH" ]; then
     ARCH=$(go env GOHOSTARCH)
 fi
 
-HELM_TAG_DEV=dev
-HELM_VERSION_DEV=0.0.0-dev
-HELM_TAG=${TAG:-${VERSION}}
-HELM_VERSION=${HELM_TAG/v/}
-
 TAG=${TAG:-${VERSION}}
 REPO=${REPO:-rancher}
 
-if echo $TAG | grep -q dirty; then
-    TAG=dev
-    HELM_TAG=$HELM_TAG_DEV
-    HELM_VERSION=$HELM_VERSION_DEV
+HELM_IMAGE_TAG=${HELM_IMAGE_TAG:-${TAG}}
+if [ "$TAG" == "$COMMIT" ]; then
+  HELM_CHART_VERSION="0.0.0-dev.${COMMIT}"
+else
+  HELM_CHART_VERSION=${HELM_IMAGE_TAG/v/}
 fi
+
+if echo "$TAG" | grep -q dirty; then
+    TAG="v0.0.0-dev.1-${COMMIT}"
+    HELM_IMAGE_TAG=$TAG
+    HELM_CHART_VERSION=${HELM_CHART_VERSION_DEV:-${HELM_IMAGE_TAG/v/}}
+fi
+IMAGE=${IMAGE:-"$REPO/backup-restore-operator:${TAG}"}
+
+function print_version_debug() {
+    echo "DIRTY: $DIRTY"
+    echo "HELM_IMAGE_TAG: $HELM_IMAGE_TAG";
+    echo "HELM_CHART_VERSION: $HELM_CHART_VERSION";
+    echo "REPO: $REPO; TAG: $TAG";
+    echo "IMAGE: $IMAGE";
+}
+if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then print_version_debug "$1"; fi