Fix KCM livenessProbe to use secure port

kubernetes · May 11, 2021 · 47add60 · 47add60
1 parent 6dd743f
commit 47add60
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/nodeup/pkg/model/kube_controller_manager.go b/nodeup/pkg/model/kube_controller_manager.go
@@ -173,9 +173,10 @@ func (b *KubeControllerManagerBuilder) buildPod() (*v1.Pod, error) {
 		LivenessProbe: &v1.Probe{
 			Handler: v1.Handler{
 				HTTPGet: &v1.HTTPGetAction{
-					Host: "127.0.0.1",
-					Path: "/healthz",
-					Port: intstr.FromInt(10252),
+					Host:   "127.0.0.1",
+					Path:   "/healthz",
+					Port:   intstr.FromInt(10257),
+					Scheme: "HTTPS",
 				},
 			},
 			InitialDelaySeconds: 15,

diff --git a/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml b/nodeup/pkg/model/tests/golden/minimal/tasks-kube-controller-manager.yaml
@@ -38,7 +38,8 @@ contents: |
         httpGet:
           host: 127.0.0.1
           path: /healthz
-          port: 10252
+          port: 10257
+          scheme: HTTPS
         initialDelaySeconds: 15
         timeoutSeconds: 15
       name: kube-controller-manager

diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-amd64.yaml
@@ -38,7 +38,8 @@ contents: |
         httpGet:
           host: 127.0.0.1
           path: /healthz
-          port: 10252
+          port: 10257
+          scheme: HTTPS
         initialDelaySeconds: 15
         timeoutSeconds: 15
       name: kube-controller-manager

diff --git a/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml b/nodeup/pkg/model/tests/golden/side-loading/tasks-kube-controller-manager-arm64.yaml
@@ -38,7 +38,8 @@ contents: |
         httpGet:
           host: 127.0.0.1
           path: /healthz
-          port: 10252
+          port: 10257
+          scheme: HTTPS
         initialDelaySeconds: 15
         timeoutSeconds: 15
       name: kube-controller-manager