Use Tiller from Armada Chart

We will move from directly executing 'helm init' and use
the Tiller chart instead.

This is to align with recent changes with regards to RBAC

Change-Id: Ic8895e8e3a911a421207fdb603dc5c8b03d3568c

manifests/basic_ucp/armada-resources.yaml.sub

@@ -52,6 +52,7 @@ data:
     - kubernetes-apiserver
     - kubernetes-controller-manager
     - kubernetes-scheduler
+    - tiller
 ---
 schema: armada/ChartGroup/v1
 metadata:
@@ -827,4 +828,34 @@ data:
     reference: master
   dependencies:
     - helm-toolkit
+---
+schema: armada/Chart/v1
+metadata:
+  schema: metadata/Document/v1
+  name: tiller
+  layeringDefinition:
+    abstract: false
+    layer: site
+data:
+  chart_name: tiller
+  release: tiller
+  namespace: kube-system
+  install:
+    no_hooks: false
+  upgrade:
+    no_hooks: false
+  values:
+    images:
+      tags:
+        tiller: gcr.io/kubernetes-helm/tiller:v2.7.2
+    labels:
+      node_selector_key: ucp-control-plane
+      node_selector_value: enabled
+  source:
+    type: git
+    location: https://github.com/att-comdev/armada
+    subpath: charts/tiller
+    reference: master
+  dependencies:
+    - helm-toolkit
 ...

manifests/basic_ucp/deploy_ucp.sh

@@ -218,17 +218,7 @@ function genesis {
     cat /etc/kubernetes/admin/kubeconfig.yaml | sed -e 's/\/etc\/kubernetes\/admin/./' > ~/.kube/config
 }
 
-function helm_init {
-    # Run helm init since promenade tears down temporary tiller
-    helm init
-}
-
 function ucp_deploy {
-    while [[ -z $(kubectl get pods -n kube-system | grep tiller | grep Running) ]]
-    do
-      echo 'Waiting for tiller to be ready.'
-      sleep 10
-    done
 
     docker run -t -v ~/.kube:/armada/.kube -v $(pwd):/target --net=host ${ARMADA_IMAGE} apply /target/${ARMADA_CONFIG}
 
@@ -237,5 +227,4 @@ function ucp_deploy {
 
 init_env
 genesis
-helm_init
 ucp_deploy