Merge pull request #671 from k8s-infra-cherrypick-robot/cherry-pick-666-to-release-0.15

🌱 Implement healthz and readyz checks in the deployment

Author: k8s-ci-robot

hack/charts/cluster-api-operator/templates/deployment.yaml

@@ -123,6 +123,30 @@ spec:
         {{- toYaml . | nindent 12 }}
         {{- end }}
         terminationMessagePolicy: FallbackToLogsOnError
+        {{- $healthAddr := $.Values.healthAddr }}
+        {{- if contains ":" $healthAddr -}}
+        {{ $healthAddr = ( split ":" $.Values.healthAddr)._1 | int }}
+        {{- end }}
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: {{ $healthAddr | default 9440 }}
+            scheme: HTTP
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          successThreshold: 1
+          timeoutSeconds: 1
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: {{ $healthAddr | default 9440 }}
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
       terminationGracePeriodSeconds: 10
       {{- with .Values.volumes }}
       volumes:

hack/charts/cluster-api-operator/values.yaml

@@ -23,8 +23,8 @@ image:
     pullPolicy: IfNotPresent
 env:
   manager: []
-healthAddr: ":8081"
 diagnosticsAddress: ":8443"
+healthAddr: ":9440"
 insecureDiagnostics: false
 watchConfigSecret: false
 imagePullSecrets: {}

test/e2e/resources/full-chart-install.yaml

@@ -28386,7 +28386,7 @@ spec:
       containers:
       - args:
         - --v=2
-        - --health-addr=:8081
+        - --health-addr=:9440
         - --diagnostics-address=:8443
         - --leader-elect=true
         command:
@@ -28413,6 +28413,26 @@ spec:
               name: cert
               readOnly: true
         terminationMessagePolicy: FallbackToLogsOnError
+        livenessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /healthz
+            port: 9440
+            scheme: HTTP
+          initialDelaySeconds: 15
+          periodSeconds: 20
+          successThreshold: 1
+          timeoutSeconds: 1
+        readinessProbe:
+          failureThreshold: 3
+          httpGet:
+            path: /readyz
+            port: 9440
+            scheme: HTTP
+          initialDelaySeconds: 5
+          periodSeconds: 10
+          successThreshold: 1
+          timeoutSeconds: 1
       terminationGracePeriodSeconds: 10
       volumes:
         - name: cert