Merge pull request #2526 from andyzhangx/fix-liveness-proble-failure-…

…linux-1.29 [release-1.29] fix: liveness probe failure when hostNetwork not enabled on linux node
kubernetes-sigs · Sep 20, 2024 · d93cc80 · d93cc80
2 parents a664c28 + 545044f
commit d93cc80
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/charts/latest/azuredisk-csi-driver-v1.29.9.tgz b/charts/latest/azuredisk-csi-driver-v1.29.9.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -75,7 +75,11 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
+{{- if eq .Values.node.hostNetwork true }}
             - --http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}
+{{- else }}
+            - --health-port={{ .Values.node.livenessProbe.healthPort }}
+{{- end }}
             - --v=2
           resources: {{- toYaml .Values.linux.resources.livenessProbe | nindent 12 }}
           securityContext:
@@ -140,12 +144,22 @@ spec:
             - "--get-node-info-from-labels={{ .Values.linux.getNodeInfoFromLabels }}"
             - "--get-nodeid-from-imds={{ .Values.node.getNodeIDFromIMDS }}"
             - "--enable-otel-tracing={{ .Values.linux.otelTracing.enabled }}"
+{{- if ne .Values.node.hostNetwork true }}
+          ports:
+            - containerPort: {{ .Values.node.livenessProbe.healthPort }}
+              name: healthz
+              protocol: TCP
+{{- end }}
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
+{{- if eq .Values.node.hostNetwork true }}
+              host: localhost
               port: {{ .Values.node.livenessProbe.healthPort }}
+{{- else }}
+              port: healthz
+{{- end }}
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

diff --git a/deploy/csi-azuredisk-node.yaml b/deploy/csi-azuredisk-node.yaml
@@ -102,6 +102,10 @@ spec:
             - "--enable-perf-optimization=true"
             - "--allow-empty-cloud-config=true"
             - "--get-node-info-from-labels=false"
+          ports:
+            - containerPort: 29603
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet: