revert upgrade command restructure

rancher · Jan 7, 2025 · 19988ea · 19988ea
1 parent a4f6c5f
commit 19988ea
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 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
@@ -12,9 +12,6 @@ fetch-team-chart "helm-project-operator" "$NEWEST_CHART_VERSION"
 LATEST_CHART_PATH="./build/charts/helm-project-operator-${NEWEST_CHART_VERSION}.tgz"
 tar -xvzf "$LATEST_CHART_PATH" -C ./build/charts/
 
-helm upgrade --install --create-namespace -n cattle-helm-system helm-project-operator \
-  --set "image.registry='',image.repository=${REPO:-rancher}/helm-project-operator,image.tag=${TAG:-dev}" \
-  "${cluster_args}" "${RANCHER_HELM_ARGS}" \
-  ./build/charts/helm-project-operator
+helm upgrade --install --create-namespace -n cattle-helm-system helm-project-operator --set image.registry='',image.repository=${REPO:-rancher}/helm-project-operator,image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ./build/charts/helm-project-operator
 
 echo "PASS: Helm Project Operator has been installed"
diff --git a/.github/workflows/e2e/scripts/install-federator.sh b/.github/workflows/e2e/scripts/install-federator.sh
@@ -13,10 +13,6 @@ fetch-team-chart "prometheus-federator" "$NEWEST_CHART_VERSION"
 LATEST_CHART_PATH="./build/charts/prometheus-federator-${NEWEST_CHART_VERSION}.tgz"
 tar -xvzf "$LATEST_CHART_PATH" -C ./build/charts/
 
-helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator \
-  --set "helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator" \
-  --set "helmProjectOperator.image.tag=${TAG:-dev}" \
-  "${cluster_args}" "${RANCHER_HELM_ARGS}" \
-  ./build/charts/prometheus-federator
+helm upgrade --install --create-namespace -n cattle-monitoring-system prometheus-federator --set helmProjectOperator.image.repository=${REPO:-rancher}/prometheus-federator --set helmProjectOperator.image.tag=${TAG:-dev} ${cluster_args} ${RANCHER_HELM_ARGS} ./build/charts/prometheus-federator
 
 echo "PASS: Prometheus Federator has been installed"