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