Commit cab99a10 authored by Albert Salim's avatar Albert Salim

Add tiller-namespace explicitly in helm commands

parent 698ae0d1
[[ "$TRACE" ]] && set -x [[ "$TRACE" ]] && set -x
export TILLER_NAMESPACE="$KUBE_NAMESPACE"
function deploy_exists() { function deploy_exists() {
local namespace="${1}" local namespace="${1}"
...@@ -49,7 +48,7 @@ function delete_release() { ...@@ -49,7 +48,7 @@ function delete_release() {
echoinfo "Deleting release '$deploy'..." true echoinfo "Deleting release '$deploy'..." true
helm delete --purge --tiller-namespace "${namespace}" "$deploy" helm delete --purge --tiller-namespace "${namespace}" "${deploy}"
} }
function delete_failed_release() { function delete_failed_release() {
...@@ -120,6 +119,7 @@ function ensure_namespace() { ...@@ -120,6 +119,7 @@ function ensure_namespace() {
} }
function install_tiller() { function install_tiller() {
local TILLER_NAMESPACE="$KUBE_NAMESPACE"
echoinfo "Checking deployment/tiller-deploy status in the ${TILLER_NAMESPACE} namespace..." true echoinfo "Checking deployment/tiller-deploy status in the ${TILLER_NAMESPACE} namespace..." true
echoinfo "Initiating the Helm client..." echoinfo "Initiating the Helm client..."
...@@ -134,11 +134,12 @@ function install_tiller() { ...@@ -134,11 +134,12 @@ function install_tiller() {
--override "spec.template.spec.tolerations[0].key"="dedicated" \ --override "spec.template.spec.tolerations[0].key"="dedicated" \
--override "spec.template.spec.tolerations[0].operator"="Equal" \ --override "spec.template.spec.tolerations[0].operator"="Equal" \
--override "spec.template.spec.tolerations[0].value"="helm" \ --override "spec.template.spec.tolerations[0].value"="helm" \
--override "spec.template.spec.tolerations[0].effect"="NoSchedule" --override "spec.template.spec.tolerations[0].effect"="NoSchedule" \
--tiller-namespace "${TILLER_NAMESPACE}"
kubectl rollout status -n "$TILLER_NAMESPACE" -w "deployment/tiller-deploy" kubectl rollout status -n "$TILLER_NAMESPACE" -w "deployment/tiller-deploy"
if ! helm version --debug; then if ! helm version --debug --tiller-namespace "${TILLER_NAMESPACE}"; then
echo "Failed to init Tiller." echo "Failed to init Tiller."
return 1 return 1
fi fi
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment