From 29389745636d5de09496bd4377e67061b0df42cd Mon Sep 17 00:00:00 2001
From: Dominic Gunn <dominic@fable.sh>
Date: Tue, 26 May 2020 11:21:00 +0100
Subject: [PATCH] Allow custom port name for kiam

---
 builtin/files/cluster.yaml.tmpl                           | 1 +
 builtin/files/plugins/dashboard/manifests/deployment.yaml | 6 ++++--
 builtin/files/plugins/kiam/manifests/service.yaml         | 2 +-
 builtin/files/plugins/kiam/plugin.yaml                    | 1 +
 builtin/files/userdata/cloud-config-controller            | 3 ++-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/builtin/files/cluster.yaml.tmpl b/builtin/files/cluster.yaml.tmpl
index 369099041..4e22f331d 100644
--- a/builtin/files/cluster.yaml.tmpl
+++ b/builtin/files/cluster.yaml.tmpl
@@ -1630,6 +1630,7 @@ kubeAwsPlugins:
     # tag: v3.2
     # sessionDuration: 30m
     # server:
+    #  portName: grpclb
     #  address: localhost:443
     #  resources:
     #    requests:
diff --git a/builtin/files/plugins/dashboard/manifests/deployment.yaml b/builtin/files/plugins/dashboard/manifests/deployment.yaml
index 8404ae8b7..9d3f369aa 100644
--- a/builtin/files/plugins/dashboard/manifests/deployment.yaml
+++ b/builtin/files/plugins/dashboard/manifests/deployment.yaml
@@ -99,10 +99,12 @@ metadata:
 spec:
   ports:
     {{ if .Values.tls.enabled -}}
-    - port: 443
+    - name: https
+      port: 443
       targetPort: 8443
     {{ else -}}
-    - port: 9090
+    - name: http
+      port: 9090
       targetPort: 9090
     {{- end }}
   selector:
diff --git a/builtin/files/plugins/kiam/manifests/service.yaml b/builtin/files/plugins/kiam/manifests/service.yaml
index 8e93ec0f8..7876ef0b9 100644
--- a/builtin/files/plugins/kiam/manifests/service.yaml
+++ b/builtin/files/plugins/kiam/manifests/service.yaml
@@ -9,7 +9,7 @@ spec:
     app: kiam
     role: server
   ports:
-  - name: grpclb
+  - name: {{ .Values.server.portName }}
     port: 443
     targetPort: 443
     protocol: TCP
\ No newline at end of file
diff --git a/builtin/files/plugins/kiam/plugin.yaml b/builtin/files/plugins/kiam/plugin.yaml
index 901379ac2..a7802dc96 100644
--- a/builtin/files/plugins/kiam/plugin.yaml
+++ b/builtin/files/plugins/kiam/plugin.yaml
@@ -8,6 +8,7 @@ spec:
       tag: v3.2
       sessionDuration: 30m
       server:
+        portName: grpclb
         address: localhost:443
         resources:
           requests:
diff --git a/builtin/files/userdata/cloud-config-controller b/builtin/files/userdata/cloud-config-controller
index 17becfd33..453c0bced 100644
--- a/builtin/files/userdata/cloud-config-controller
+++ b/builtin/files/userdata/cloud-config-controller
@@ -4911,7 +4911,8 @@ write_files:
         selector:
           k8s-app: metrics-server
         ports:
-        - port: 443
+        - name: https
+          port: 443
           protocol: TCP
           targetPort: 443