Merge pull request #1859 from kubernetes-incubator/feature/v0.16.0-cu…

…stom-kiam-server-port-name [v0.16.0] Allow custom port name for kiam
kubernetes-retired · May 27, 2020 · 6d2fee1 · 6d2fee1
2 parents 7b6e648 + 2938974
commit 6d2fee1
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/builtin/files/cluster.yaml.tmpl b/builtin/files/cluster.yaml.tmpl
@@ -1632,6 +1632,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
@@ -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
@@ -9,7 +9,7 @@ spec:
     app: kiam
     role: server
   ports:
-  - name: grpclb
+  - name: {{ .Values.server.portName }}
     port: 443
     targetPort: 443
     protocol: TCP
diff --git 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
@@ -4911,7 +4911,8 @@ write_files:
         selector:
           k8s-app: metrics-server
         ports:
-        - port: 443
+        - name: https
+          port: 443
           protocol: TCP
           targetPort: 443