From 67ac5da9edb14b81401aa39a1c13aa3081e7dea4 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Wed, 11 Aug 2021 10:33:19 -0500
Subject: [PATCH] Update helm repo url

The googleapi repo has been causing issues and the latest
one is giving an unauthorized error when trying to download
helm tarball.

This change moves the repo to use the official helm one.

Change-Id: I52607b0ca6d650d5f5e4a95045389970faa08cfb
---
 roles/build-helm-packages/defaults/main.yml           | 2 +-
 roles/build-helm-packages/tasks/setup-helm-serve.yaml | 4 ++--
 roles/build-images/defaults/main.yml                  | 2 +-
 tools/gate/lint.sh                                    | 4 ++--
 tools/images/kubeadm-aio/Dockerfile                   | 6 +++---
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/roles/build-helm-packages/defaults/main.yml b/roles/build-helm-packages/defaults/main.yml
index 9add532bb..24464f9ae 100644
--- a/roles/build-helm-packages/defaults/main.yml
+++ b/roles/build-helm-packages/defaults/main.yml
@@ -14,5 +14,5 @@
 version:
   helm: v2.17.0
 url:
-  google_helm_repo: https://storage.googleapis.com/kubernetes-helm
+  helm_repo: https://get.helm.sh
 ...
diff --git a/roles/build-helm-packages/tasks/setup-helm-serve.yaml b/roles/build-helm-packages/tasks/setup-helm-serve.yaml
index bf024c5ea..6e6ae7cc8 100644
--- a/roles/build-helm-packages/tasks/setup-helm-serve.yaml
+++ b/roles/build-helm-packages/tasks/setup-helm-serve.yaml
@@ -25,12 +25,12 @@
       become_user: root
       shell: |
               TMP_DIR=$(mktemp -d)
-              curl -sSL ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
+              curl -sSL ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR}
               sudo mv ${TMP_DIR}/helm /usr/bin/helm
               rm -rf ${TMP_DIR}
       environment:
         HELM_VERSION: "{{ version.helm }}"
-        GOOGLE_HELM_REPO_URL: "{{ url.google_helm_repo }}"
+        HELM_REPO_URL: "{{ url.helm_repo }}"
       args:
         executable: /bin/bash
     - name: setting up helm client
diff --git a/roles/build-images/defaults/main.yml b/roles/build-images/defaults/main.yml
index a868e8267..6f6332f17 100644
--- a/roles/build-images/defaults/main.yml
+++ b/roles/build-images/defaults/main.yml
@@ -27,6 +27,6 @@ images:
 
 url:
   google_kubernetes_repo: https://storage.googleapis.com/kubernetes-release/release/{{ version.kubernetes }}/bin/linux/amd64
-  google_helm_repo: https://storage.googleapis.com/kubernetes-helm
+  helm_repo: https://get.helm.sh
   cni_repo: https://github.com/containernetworking/plugins/releases/download/{{ version.cni }}
 ...
diff --git a/tools/gate/lint.sh b/tools/gate/lint.sh
index 3d5f57d2d..8e7e4ce6f 100755
--- a/tools/gate/lint.sh
+++ b/tools/gate/lint.sh
@@ -4,14 +4,14 @@ set -e
 
 HELM_DATA_YAML=../openstack-helm-infra/roles/build-helm-packages/defaults/main.yml
 HELM_VERSION=$(yq -r '.version.helm' ${HELM_DATA_YAML})
-GOOGLE_HELM_REPO_URL=$(yq -r '.url.google_helm_repo' ${HELM_DATA_YAML})
+HELM_REPO_URL=$(yq -r '.url.helm_repo' ${HELM_DATA_YAML})
 LINT_DIR=.yamllint
 
 rm -rf */charts/helm-toolkit
 mkdir ${LINT_DIR}
 cp -r * ${LINT_DIR}
 rm -rf ${LINT_DIR}/*/templates
-wget -qO ${LINT_DIR}/helm.tgz ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz
+wget -qO ${LINT_DIR}/helm.tgz ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz
 tar xzf ${LINT_DIR}/helm.tgz -C ${LINT_DIR} --strip-components=1 linux-amd64/helm
 
 for i in */; do
diff --git a/tools/images/kubeadm-aio/Dockerfile b/tools/images/kubeadm-aio/Dockerfile
index a789ec9c9..08f11e97e 100644
--- a/tools/images/kubeadm-aio/Dockerfile
+++ b/tools/images/kubeadm-aio/Dockerfile
@@ -32,8 +32,8 @@ Acquire::AllowDowngradeToInsecureRepositories \"${ALLOW_UNAUTHENTICATED}\";" \
 ARG GOOGLE_KUBERNETES_REPO_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBE_VERSION}/bin/linux/amd64
 ENV GOOGLE_KUBERNETES_REPO_URL ${GOOGLE_KUBERNETES_REPO_URL}
 
-ARG GOOGLE_HELM_REPO_URL=https://storage.googleapis.com/kubernetes-helm
-ENV GOOGLE_HELM_REPO_URL ${GOOGLE_HELM_REPO_URL}
+ARG HELM_REPO_URL=https://get.helm.sh
+ENV HELM_REPO_URL ${HELM_REPO_URL}
 
 ARG KUBE_VERSION="v1.18.9"
 ENV KUBE_VERSION ${KUBE_VERSION}
@@ -100,7 +100,7 @@ RUN set -ex ;\
     curl -sSL ${CNI_REPO_URL}/cni-plugins-linux-amd64-$CNI_VERSION.tgz | \
       tar -zxv --strip-components=1 -C /opt/assets${CNI_BIN_DIR} ;\
     TMP_DIR=$(mktemp -d) ;\
-    curl -sSL ${GOOGLE_HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} ;\
+    curl -sSL ${HELM_REPO_URL}/helm-${HELM_VERSION}-linux-amd64.tar.gz | tar -zxv --strip-components=1 -C ${TMP_DIR} ;\
     mv ${TMP_DIR}/helm /usr/bin/helm ;\
     rm -rf ${TMP_DIR} ;\
     apt-get purge -y --auto-remove \