Merge "Fix tiller metrics port exposure issue for minikube"

tools/deployment/common/005-deploy-k8s.sh

@@ -182,25 +182,21 @@ helm init --service-account helm-tiller --output yaml \
   | kubectl apply -f -
 
   # Patch tiller-deploy service to expose metrics port
-  tee /tmp/tiller-deploy.yaml << EOF
+tee /tmp/tiller-deploy.yaml << EOF
-  metadata:
+metadata:
-    annotations:
+  annotations:
-      prometheus.io/scrape: "true"
+    prometheus.io/scrape: "true"
-      prometheus.io/port: "44135"
+    prometheus.io/port: "44135"
-  spec:
+spec:
-    ports:
+  ports:
-    - name: http
+  - name: http
-      port: 44135
+    port: 44135
-      targetPort: http
+    targetPort: http
-  EOF
-  kubectl patch service tiller-deploy -n kube-system --patch "$(cat /tmp/tiller-deploy.yaml)"
-
-kubectl --namespace=kube-system wait \
-  --timeout=240s \
-  --for=condition=Ready \
-  pod -l app=helm,name=tiller
 EOF
 
+kubectl patch service tiller-deploy -n kube-system --patch "$(cat /tmp/tiller-deploy.yaml)"
+kubectl --namespace=kube-system wait --timeout=240s --for=condition=Ready pod -l app=helm,name=tiller
+
 helm init --client-only
 
 # Set up local helm server