Allow using insecure TLS for metrics-server with Kubernetes 1.19+

kubernetes · May 22, 2021 · 3cefe89 · 3cefe89
1 parent 0d92bfe
commit 3cefe89
Showing 1 changed file with 2 additions and 4 deletions.
diff --git a/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template b/upup/models/cloudup/resources/addons/metrics-server.addons.k8s.io/k8s-1.11.yaml.template
@@ -131,14 +131,12 @@ spec:
       - args:
           - --secure-port=4443
           - --kubelet-use-node-status-port
-{{ if not (WithDefaultBool .MetricsServer.Insecure true) }}
+{{ if and (not (WithDefaultBool .MetricsServer.Insecure true)) UseKopsControllerForNodeBootstrap }}
           - --tls-cert-file=/srv/tls.crt
           - --tls-private-key-file=/srv/tls.key
 {{ else }}
-          - --cert-dir=/tmp
-{{ end }}
-{{ if not UseKopsControllerForNodeBootstrap }}
           - --kubelet-insecure-tls
+          - --cert-dir=/tmp
 {{ end }}
         image: {{ or .MetricsServer.Image "k8s.gcr.io/metrics-server/metrics-server:v0.4.3" }}
         imagePullPolicy: IfNotPresent