openstack
/
magnum
Code Issues Proposed changes

Merge "Do not exit in the enable-helm-tiller script"

This commit is contained in:
Zuul 2019-03-06 09:46:49 +00:00 committed by Gerrit Code Review
parent 83c8b13bf0 3695536085
commit 6505aa360d
1 changed files with 45 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
magnum/drivers/common/templates/kubernetes/fragments/enable-helm-tiller.sh
View File

@ -2,12 +2,10 @@
. /etc/sysconfig/heat-params
set -x
if [ "$(echo ${TILLER_ENABLED} | tr '[:upper:]' '[:lower:]')" != "true" ]; then
exit 0
fi
step="enable-helm-tiller"
printf "Starting to run ${step}\n"
if [ "$(echo ${TILLER_ENABLED} | tr '[:upper:]' '[:lower:]')" == "true" ]; then
CERTS_DIR="/etc/kubernetes/helm/certs/"
mkdir -p "${CERTS_DIR}"
@ -221,11 +219,14 @@ data:
EOF
}
echo "Waiting for Kubernetes API..."
until [ "ok" = "$(curl --silent http://127.0.0.1:8080/healthz)" ]
do
echo "Waiting for Kubernetes API..."
sleep 5
done
kubectl apply -f ${TILLER_RBAC}
kubectl apply -f ${TILLER_DEPLOYER}
fi
printf "Finished running ${step}\n"