Merge pull request #1875 from kubernetes-sigs/liveness-probe-fix-1.29

[release-1.29] fix: liveness probe failure when hostNetwork not enabled in controller

Author: andyzhangx

charts/latest/azurefile-csi-driver-v1.29.5.tgz

@@ -135,7 +135,11 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
+{{- if eq .Values.controller.hostNetwork true }}
             - --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
+{{- else }}
+            - --health-port={{ .Values.controller.livenessProbe.healthPort }}
+{{- end }}
             - --v=2
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           volumeMounts:
@@ -163,12 +167,21 @@ spec:
             - containerPort: {{ .Values.controller.metricsPort }}
               name: metrics
               protocol: TCP
+{{- if ne .Values.controller.hostNetwork true }}
+            - containerPort: {{ .Values.controller.livenessProbe.healthPort }}
+              name: healthz
+              protocol: TCP
+{{- end }}
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
+{{- if eq .Values.controller.hostNetwork true }}
+              host: localhost
               port: {{ .Values.controller.livenessProbe.healthPort }}
+{{- else }}
+              port: healthz
+{{- end }}
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

charts/latest/azurefile-csi-driver/templates/csi-azurefile-controller.yaml

@@ -135,7 +135,11 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
+{{- if eq .Values.controller.hostNetwork true }}
             - --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
+{{- else }}
+            - --health-port={{ .Values.controller.livenessProbe.healthPort }}
+{{- end }}
             - --v=2
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           volumeMounts:
@@ -163,12 +167,21 @@ spec:
             - containerPort: {{ .Values.controller.metricsPort }}
               name: metrics
               protocol: TCP
+{{- if ne .Values.controller.hostNetwork true }}
+            - containerPort: {{ .Values.controller.livenessProbe.healthPort }}
+              name: healthz
+              protocol: TCP
+{{- end }}
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
+{{- if eq .Values.controller.hostNetwork true }}
+              host: localhost
               port: {{ .Values.controller.livenessProbe.healthPort }}
+{{- else }}
+              port: healthz
+{{- end }}
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30