Merge "Fix port conflict for tiller"

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 }}

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

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 }}
@@ -94,6 +94,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 }}
@@ -112,7 +116,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 }}

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:
   security_context: