diff --git a/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh b/.github/workflows/e2e/scripts/hpo-install-helm-project-operator.sh index 283ac468..b3bff034 100755 --- 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 index 8a106bd6..51510765 100755 --- 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"