Adjust image name for dev images

rancher · Nov 22, 2024 · 33b69fc · 33b69fc
1 parent 5905fb9
commit 33b69fc
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh
@@ -64,6 +64,6 @@ case "${KUBERNETES_DISTRIBUTION_TYPE}" in
     exit 1
 esac
 
-helm upgrade --install --create-namespace -n cattle-helm-system helm-project-operator --set image.repository=${REPO:-rancher}/helm-project-operator --set image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ${latest_chart}
+helm upgrade --install --create-namespace -n cattle-helm-system helm-project-operator --set image.registry='',image.repository=${REPO:-rancher}/prometheus-federator/helm-project-operator,image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ${latest_chart}
 
 echo "PASS: Helm Project Operator has been installed"
diff --git a/.github/workflows/hpo-e2e-ci.yaml b/.github/workflows/hpo-e2e-ci.yaml
@@ -70,7 +70,7 @@ jobs:
         run : K3S_VERSION=${{ env.K3S_VERSION }} ./.github/workflows/e2e/scripts/setup-cluster.sh
       - name: Import Images Into k3d
         run: |
-          k3d image import ${REPO}/helm-project-operator:${TAG} -c "$CLUSTER_NAME";
+          k3d image import ${REPO}/prometheus-federator/helm-project-operator:${TAG} -c "$CLUSTER_NAME";
       - name: Setup kubectl context
         run: |
           kubectl config use-context "k3d-$CLUSTER_NAME";

diff --git a/scripts/version b/scripts/version
@@ -40,7 +40,11 @@ if echo "$TAG" | grep -q dirty; then
     HELM_IMAGE_TAG=$TAG
     HELM_CHART_VERSION=${HELM_CHART_VERSION_DEV:-${HELM_IMAGE_TAG/v/}}
 fi
-IMAGE=${IMAGE:-"$REPO/${BUILD_TARGET}:${TAG}"}
+if [ "$BUILD_TARGET" != "prometheus-federator" ]; then
+  IMAGE=${IMAGE:-"$REPO/prometheus-federator/${BUILD_TARGET}:${TAG}"}
+else
+  IMAGE=${IMAGE:-"$REPO/${BUILD_TARGET}:${TAG}"}
+fi
 
 function print_version_debug() {
     echo "DIRTY: $DIRTY"