From 2203d1dad030941e87f0b48a0104687fce667920 Mon Sep 17 00:00:00 2001
From: "Kumar, Nishant (nk613n)" <nk613n@att.com>
Date: Wed, 20 Nov 2019 13:10:57 -0500
Subject: [PATCH] Fix port conflict for tiller

This change is primarily based on this PS-https://review.opendev.org/#/c/659369/

Change-Id: Ia213445be76b58870bec009b75a16a4e3374a5c3
---
 charts/armada/templates/deployment-api.yaml    |  8 ++++++--
 charts/armada/values.yaml                      |  3 ++-
 charts/tiller/templates/deployment-tiller.yaml | 10 +++++++---
 charts/tiller/values.yaml                      |  2 ++
 4 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
index 70818bae..28371c06 100644
--- a/charts/armada/templates/deployment-api.yaml
+++ b/charts/armada/templates/deployment-api.yaml
@@ -23,14 +23,14 @@ httpGet:
 {{- define "tillerReadinessProbeTemplate" }}
 httpGet:
   path: /readiness
-  port: 44135
+  port: {{ .Values.conf.tiller.probe_port }}
   scheme: HTTP
 {{- end }}
 
 {{- define "tillerLivenessProbeTemplate" }}
 httpGet:
   path: /liveness
-  port: 44135
+  port: {{ .Values.conf.tiller.probe_port }}
   scheme: HTTP
 {{- end }}
 
@@ -167,6 +167,10 @@ spec:
 {{- if .Values.conf.tiller.storage }}
             - --storage={{ .Values.conf.tiller.storage }}
 {{- end }}
+            - -listen
+            - ":{{ .Values.conf.tiller.port }}"
+            - -probe-listen
+            - ":{{ .Values.conf.tiller.probe_port }}"
             - -logtostderr
             - -v
             - {{ .Values.conf.tiller.verbosity | quote }}
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
index 1916fe9e..59572ba3 100644
--- a/charts/armada/values.yaml
+++ b/charts/armada/values.yaml
@@ -206,7 +206,8 @@ conf:
   tiller:
     # If set to false then some form of Tiller needs to be provided
     enabled: true
-    port: 44134
+    port: 24134
+    probe_port: 24135
     verbosity: 5
     trace: false
     storage: null
diff --git a/charts/tiller/templates/deployment-tiller.yaml b/charts/tiller/templates/deployment-tiller.yaml
index 68dd5dca..3757acd3 100644
--- a/charts/tiller/templates/deployment-tiller.yaml
+++ b/charts/tiller/templates/deployment-tiller.yaml
@@ -18,14 +18,14 @@ limitations under the License.
 httpGet:
   scheme: HTTP
   path: /readiness
-  port: 44135
+  port: {{ .Values.conf.tiller.probe_port }}
 {{- end }}
 
 {{- define "tillerLivenessProbeTemplate" }}
 httpGet:
   scheme: HTTP
   path: /liveness
-  port: 44135
+  port: {{ .Values.conf.tiller.probe_port }}
 {{- end }}
 
 {{- if .Values.manifests.deployment_tiller }}
@@ -92,6 +92,10 @@ spec:
 {{- if .Values.conf.tiller.storage }}
             - --storage={{ .Values.conf.tiller.storage }}
 {{- end }}
+            - -listen
+            - ":{{ .Values.conf.tiller.port }}"
+            - -probe-listen
+            - ":{{ .Values.conf.tiller.probe_port }}"
             - -logtostderr
             - -v
             - {{ .Values.conf.tiller.verbosity | quote }}
@@ -110,7 +114,7 @@ spec:
                   - "{{ .Values.conf.tiller.prestop_sleep }}"
           ports:
             - name: tiller
-              containerPort: 44134
+              containerPort: {{ .Values.conf.tiller.port }}
               protocol: TCP
 {{ dict "envAll" $envAll "component" "tiller" "container" "tiller" "type" "readiness" "probeTemplate" (include "tillerReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
 {{ dict "envAll" $envAll "component" "tiller" "container" "tiller" "type" "liveness" "probeTemplate" (include "tillerLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
diff --git a/charts/tiller/values.yaml b/charts/tiller/values.yaml
index a6e16c6c..07b4f367 100644
--- a/charts/tiller/values.yaml
+++ b/charts/tiller/values.yaml
@@ -49,6 +49,8 @@ conf:
     # Note: Defaulting to the (default) kubernetes grace period, as anything
     # greater than that will have no effect.
     prestop_sleep: 30
+    port: 44134
+    probe_port: 44135
 
 pod:
   probes: