From bc167cc6f4947a6421214fd98042c0b236dc1e62 Mon Sep 17 00:00:00 2001
From: Niels de Vos <ndevos@ibm.com>
Date: Mon, 22 May 2023 09:30:40 +0200
Subject: [PATCH] ci: install Helm with script located on GitHub

Installing Helm fails often in the CI. The Helm documentation does not
point to `https://git.io/get_helm.sh` anymore, but to a location on
GitHub. To make it easier to update the location in the future, it has
now been added to `build.env`, just like the `HELM_VERSION`.

See-also: https://helm.sh/docs/intro/install/
Signed-off-by: Niels de Vos <ndevos@ibm.com>
---
 build.env               | 3 +++
 deploy.sh               | 2 +-
 scripts/Dockerfile.test | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.env b/build.env
index e24529c23..b462dc569 100644
--- a/build.env
+++ b/build.env
@@ -34,6 +34,9 @@ SNAPSHOT_VERSION=v6.1.0
 #TEST_COVERAGE=html
 #GO_COVER_DIR=_output/
 
+# URL for the script to install Helm
+HELM_SCRIPT=https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+
 # helm chart generation, testing and publishing
 HELM_VERSION=v3.10.1
 
diff --git a/deploy.sh b/deploy.sh
index 0cc245a7a..5cd618895 100755
--- a/deploy.sh
+++ b/deploy.sh
@@ -104,7 +104,7 @@ CSI_CHARTS_DIR=$(mktemp -d)
 
 pushd "${CSI_CHARTS_DIR}" >/dev/null
 
-curl -L https://git.io/get_helm.sh | bash -s -- --version "${HELM_VERSION}"
+curl -L "${HELM_SCRIPT}" | bash -s -- --version "${HELM_VERSION}"
 
 build_step "cloning ceph/csi-charts repository"
 git clone https://github.com/ceph/csi-charts
diff --git a/scripts/Dockerfile.test b/scripts/Dockerfile.test
index b3f218aa9..4efb764b9 100644
--- a/scripts/Dockerfile.test
+++ b/scripts/Dockerfile.test
@@ -50,7 +50,7 @@ RUN source /build.env \
        | tar xzf - -C ${GOROOT} --strip-components=1 \
     && curl -sf "https://raw.githubusercontent.com/golangci/golangci-lint/${GOLANGCI_VERSION}/install.sh" \
        | bash -s -- -b ${GOPATH}/bin "${GOLANGCI_VERSION}" \
-    && curl -L https://git.io/get_helm.sh | bash -s -- --version "${HELM_VERSION}" \
+    && curl -L "${HELM_SCRIPT}" | bash -s -- --version "${HELM_VERSION}" \
     && mkdir /opt/commitlint && pushd /opt/commitlint \
     && npm init -y \
     && npm install @commitlint/cli@"${COMMITLINT_VERSION}" \