fix script path

rancher · Jan 7, 2025 · 383bf1c · 383bf1c
1 parent 0709009
commit 383bf1c
Show file tree

Hide file tree

Showing 2 changed files with 11 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
@@ -5,7 +5,7 @@ source $(dirname $0)/entry
 source $(dirname $0)/cluster-args.sh
 
 cd $(dirname $0)/../../../..
-source "$(dirname "$0")/scripts/util-team-charts"
+source "$(pwd)/scripts/util-team-charts"
 
 NEWEST_CHART_VERSION=$(newest-chart-version "helm-project-operator")
 fetch-team-chart "helm-project-operator" "$NEWEST_CHART_VERSION"

diff --git a/.github/workflows/e2e/scripts/install-federator.sh b/.github/workflows/e2e/scripts/install-federator.sh
@@ -6,9 +6,17 @@ source $(dirname $0)/entry
 source $(dirname $0)/cluster-args.sh
 
 cd $(dirname $0)/../../../..
+source "$(pwd)/scripts/util-team-charts"
 
-latest_chart=$(find ./charts/prometheus-federator -type d -maxdepth 1 -mindepth 1 | tr - \~ | sort -rV | tr \~ - | head -n1)
+NEWEST_CHART_VERSION=$(newest-chart-version "prometheus-federator")
+fetch-team-chart "prometheus-federator" "$NEWEST_CHART_VERSION"
+LATEST_CHART_PATH="./build/charts/prometheus-federator-${NEWEST_CHART_VERSION}.tgz"
 
-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} ${latest_chart}
+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}" \
+  "${LATEST_CHART_PATH}"
 
 echo "PASS: Prometheus Federator has been installed"