Browse Source

Merge "Support proxy for helm install" into stable/train

tags/9.4.0
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
246a26610a
5 changed files with 51 additions and 0 deletions
  1. +11
    -0
      magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh
  2. +10
    -0
      magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh
  3. +10
    -0
      magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh
  4. +10
    -0
      magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh
  5. +10
    -0
      magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh

+ 11
- 0
magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh View File

@@ -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)" ]


+ 10
- 0
magnum/drivers/common/templates/kubernetes/helm/ingress-nginx.sh View File

@@ -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


+ 10
- 0
magnum/drivers/common/templates/kubernetes/helm/metrics-server.sh View File

@@ -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


+ 10
- 0
magnum/drivers/common/templates/kubernetes/helm/prometheus-adapter.sh View File

@@ -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


+ 10
- 0
magnum/drivers/common/templates/kubernetes/helm/prometheus-operator.sh View File

@@ -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


Loading…
Cancel
Save