From 40398f82024e59d33cbf1159512f2cf93fac44e5 Mon Sep 17 00:00:00 2001
From: Feilong Wang <flwang@catalyst.net.nz>
Date: Thu, 28 May 2020 20:26:24 +1200
Subject: [PATCH] Support proxy for helm install

Export proxy settings for helm install to make sure
helm can reach charts site.

Task: 39877
Story: 2007725

Change-Id: I4de26d40b7c5ba2759b4892349c59cf3cc870241
(cherry picked from commit 84324e1072944bb06b6e39fc1a89054ffb276e5e)
(cherry picked from commit b90dff5b78478a11b4bc0dec8ff80cb1084129d2)
---
 .../kubernetes/fragments/install-helm-modules.sh      | 11 +++++++++++
 .../common/templates/kubernetes/helm/ingress-nginx.sh | 10 ++++++++++
 .../templates/kubernetes/helm/metrics-server.sh       | 10 ++++++++++
 .../templates/kubernetes/helm/prometheus-adapter.sh   | 10 ++++++++++
 .../templates/kubernetes/helm/prometheus-operator.sh  | 10 ++++++++++
 5 files changed, 51 insertions(+)

diff --git a/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh b/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh
index e8009dad10..f45bcf9d9a 100644
--- a/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh
+++ b/magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh
@@ -6,6 +6,17 @@ printf "Starting to run ${step}\n"
 . /etc/sysconfig/heat-params
 
 set -ex
+if [ ! -z "$HTTP_PROXY" ]; then
+    export HTTP_PROXY
+fi
+
+if [ ! -z "$HTTPS_PROXY" ]; then
+    export HTTPS_PROXY
+fi
+
+if [ ! -z "$NO_PROXY" ]; then
+    export NO_PROXY
+fi
 
 echo "Waiting for Kubernetes API..."
 until  [ "ok" = "$(curl --silent http://127.0.0.1:8080/healthz)" ]
diff --git a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
index 089166df4a..ed51f45c45 100755
--- a/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
@@ -34,6 +34,16 @@ data:
     mkdir -p \${HELM_HOME}
     cp /etc/helm/* \${HELM_HOME}
 
+    if [ ! -z "${HTTP_PROXY}" ]; then
+        export HTTP_PROXY=${HTTP_PROXY}
+    fi
+    if [ ! -z "${HTTPS_PROXY}" ]; then
+        export HTTPS_PROXY=${HTTPS_PROXY}
+    fi
+    if [ ! -z "${NO_PROXY}" ]; then
+        export NO_PROXY=${NO_PROXY}
+    fi
+
     # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
     until helm init --client-only --wait
     do
diff --git a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
index 97236ebfb8..4cc50d0874 100755
--- a/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
@@ -34,6 +34,16 @@ data:
     mkdir -p \${HELM_HOME}
     cp /etc/helm/* \${HELM_HOME}
 
+    if [ ! -z "${HTTP_PROXY}" ]; then
+        export HTTP_PROXY=${HTTP_PROXY}
+    fi
+    if [ ! -z "${HTTPS_PROXY}" ]; then
+        export HTTPS_PROXY=${HTTPS_PROXY}
+    fi
+    if [ ! -z "${NO_PROXY}" ]; then
+        export NO_PROXY=${NO_PROXY}
+    fi
+
     # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
     until helm init --client-only --wait
     do
diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
index fd26e07357..39a05b6c90 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
@@ -35,6 +35,16 @@ data:
     mkdir -p \${HELM_HOME}
     cp /etc/helm/* \${HELM_HOME}
 
+    if [ ! -z "${HTTP_PROXY}" ]; then
+        export HTTP_PROXY=${HTTP_PROXY}
+    fi
+    if [ ! -z "${HTTPS_PROXY}" ]; then
+        export HTTPS_PROXY=${HTTPS_PROXY}
+    fi
+    if [ ! -z "${NO_PROXY}" ]; then
+        export NO_PROXY=${NO_PROXY}
+    fi
+
     # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
     until helm init --client-only --wait
     do
diff --git a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
index 5ee38bcb86..0e70f7bf2e 100644
--- a/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
+++ b/magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh
@@ -50,6 +50,16 @@ data:
     mkdir -p \${HELM_HOME}
     cp /etc/helm/* \${HELM_HOME}
 
+    if [ ! -z "${HTTP_PROXY}" ]; then
+        export HTTP_PROXY=${HTTP_PROXY}
+    fi
+    if [ ! -z "${HTTPS_PROXY}" ]; then
+        export HTTPS_PROXY=${HTTPS_PROXY}
+    fi
+    if [ ! -z "${NO_PROXY}" ]; then
+        export NO_PROXY=${NO_PROXY}
+    fi
+
     # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
     until helm init --client-only --wait
     do