From d103da6c06acaa0630221ec5126c3fa113744947 Mon Sep 17 00:00:00 2001
From: Andrii Ostapenko <andrii.ostapenko@att.com>
Date: Thu, 23 Jul 2020 23:39:35 -0500
Subject: [PATCH] Fix tiller metrics port exposure issue for minikube

Along with fixing the bug, with this we'll decrease build time for
all jobs using minikube and collecting tiller metrics for more than
2 minutes.

Change-Id: Ia166584eae48c643248f977b959aa6336e3a327e
Signed-off-by: Andrii Ostapenko <andrii.ostapenko@att.com>
---
 tools/deployment/common/005-deploy-k8s.sh | 30 ++++++++++-------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/tools/deployment/common/005-deploy-k8s.sh b/tools/deployment/common/005-deploy-k8s.sh
index 4de2a2155..6269b87a7 100755
--- a/tools/deployment/common/005-deploy-k8s.sh
+++ b/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
-  metadata:
-    annotations:
-      prometheus.io/scrape: "true"
-      prometheus.io/port: "44135"
-  spec:
-    ports:
-    - name: http
-      port: 44135
-      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
+tee /tmp/tiller-deploy.yaml << EOF
+metadata:
+  annotations:
+    prometheus.io/scrape: "true"
+    prometheus.io/port: "44135"
+spec:
+  ports:
+  - name: http
+    port: 44135
+    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
+
 helm init --client-only
 
 # Set up local helm server