Removing Tiller support

Removed Tiller support from Helm modules install kubernetes fragment.

Change-Id: I81db0055ae82c64218498ae3e2a4fcc802f8d0e4

Author: darmach

magnum/drivers/common/templates/kubernetes/fragments/install-helm-modules.sh

@@ -24,68 +24,63 @@ until  [ "ok" = "$(kubectl get --raw='/healthz')" ]; do
     sleep 5
 done
 
-if [[ "$(echo ${TILLER_ENABLED} | tr '[:upper:]' '[:lower:]')" != "true" && "${HELM_CLIENT_TAG}" == v2.* ]]; then
-    echo "Use --labels tiller_enabled=True for helm_client_tag<v3.0.0 to allow for tiller dependent resources to be installed."
-else
-    if [ -z "${HELM_CLIENT_URL}"  ] ; then
-        HELM_CLIENT_URL="https://get.helm.sh/helm-$HELM_CLIENT_TAG-linux-amd64.tar.gz"
-    fi
-    i=0
-    until curl -o /srv/magnum/helm-client.tar.gz "${HELM_CLIENT_URL}"; do
-        i=$((i + 1))
-        [ $i -lt 5 ] || break;
-        sleep 5
-    done
+if [ -z "${HELM_CLIENT_URL}"  ] ; then
+    HELM_CLIENT_URL="https://get.helm.sh/helm-$HELM_CLIENT_TAG-linux-amd64.tar.gz"
+fi
+i=0
+until curl -o /srv/magnum/helm-client.tar.gz "${HELM_CLIENT_URL}"; do
+    i=$((i + 1))
+    [ $i -lt 5 ] || break;
+    sleep 5
+done
 
-    if ! echo "${HELM_CLIENT_SHA256} /srv/magnum/helm-client.tar.gz" | sha256sum -c - ; then
-        echo "ERROR helm-client.tar.gz computed checksum did NOT match, exiting."
-        exit 1
-    fi
+if ! echo "${HELM_CLIENT_SHA256} /srv/magnum/helm-client.tar.gz" | sha256sum -c - ; then
+    echo "ERROR helm-client.tar.gz computed checksum did NOT match, exiting."
+    exit 1
+fi
 
-    source /etc/bashrc
-    $ssh_cmd tar xzvf /srv/magnum/helm-client.tar.gz linux-amd64/helm -O > /srv/magnum/bin/helm
-    $ssh_cmd chmod +x /srv/magnum/bin/helm
+source /etc/bashrc
+$ssh_cmd tar xzvf /srv/magnum/helm-client.tar.gz linux-amd64/helm -O > /srv/magnum/bin/helm
+$ssh_cmd chmod +x /srv/magnum/bin/helm
 
-    helm_install_cmd="helm upgrade --install magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
-    helm_history_cmd="helm history magnum --namespace kube-system"
-    if [[ "${HELM_CLIENT_TAG}" == v2.* ]]; then
-        CERTS_DIR="/etc/kubernetes/helm/certs"
-        export HELM_HOME="/srv/magnum/kubernetes/helm/home"
-        export HELM_TLS_ENABLE="true"
-        export TILLER_NAMESPACE
-        mkdir -p "${HELM_HOME}"
-        ln -s ${CERTS_DIR}/helm.cert.pem ${HELM_HOME}/cert.pem
-        ln -s ${CERTS_DIR}/helm.key.pem ${HELM_HOME}/key.pem
-        ln -s ${CERTS_DIR}/ca.cert.pem ${HELM_HOME}/ca.pem
+helm_install_cmd="helm upgrade --install magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
+helm_history_cmd="helm history magnum --namespace kube-system"
+if [[ "${HELM_CLIENT_TAG}" == v2.* ]]; then
+    CERTS_DIR="/etc/kubernetes/helm/certs"
+    export HELM_HOME="/srv/magnum/kubernetes/helm/home"
+    export HELM_TLS_ENABLE="true"
+    mkdir -p "${HELM_HOME}"
+    ln -s ${CERTS_DIR}/helm.cert.pem ${HELM_HOME}/cert.pem
+    ln -s ${CERTS_DIR}/helm.key.pem ${HELM_HOME}/key.pem
+    ln -s ${CERTS_DIR}/ca.cert.pem ${HELM_HOME}/ca.pem
 
-        # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
-        until helm init --client-only --wait; do
-            sleep 5s
-        done
-        helm_install_cmd="helm upgrade --install --name magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
-        helm_history_cmd="helm history magnum"
-    fi
+    # HACK - Force wait because of bug https://github.com/helm/helm/issues/5170
+    until helm init --client-only --wait; do
+        sleep 5s
+    done
+    helm_install_cmd="helm upgrade --install --name magnum . --namespace kube-system --values values.yaml --render-subchart-notes"
+    helm_history_cmd="helm history magnum"
+fi
 
-    HELM_CHART_DIR="/srv/magnum/kubernetes/helm/magnum"
-    if [[ -d "${HELM_CHART_DIR}" ]]; then
-        pushd ${HELM_CHART_DIR}
-        cat << EOF > Chart.yaml
+HELM_CHART_DIR="/srv/magnum/kubernetes/helm/magnum"
+if [[ -d "${HELM_CHART_DIR}" ]]; then
+    pushd ${HELM_CHART_DIR}
+    cat << EOF > Chart.yaml
 apiVersion: v1
 name: magnum
 version: metachart
 appVersion: metachart
 description: Magnum Helm Charts
 EOF
-        sed -i '1i\dependencies:' requirements.yaml
+    sed -i '1i\dependencies:' requirements.yaml
 
-        i=0
-        until ($helm_history_cmd | grep magnum | grep deployed) || (helm dep update && $helm_install_cmd); do
-            i=$((i + 1))
-            [ $i -lt 60 ] || break;
-            sleep 5
-        done
-        popd
-    fi
+    i=0
+    until ($helm_history_cmd | grep magnum | grep deployed) || (helm dep update && $helm_install_cmd); do
+        i=$((i + 1))
+        [ $i -lt 60 ] || break;
+        sleep 5
+    done
+    popd
 fi
 
 echo "END: ${step}"