Merge pull request #1337 from andyzhangx/http-endpoint-1.24

[release-1.24] feat: use new restricted liveness probe endpoint

Author: andyzhangx

charts/latest/blob-csi-driver-v1.24.0.tgz

@@ -91,7 +91,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
-            - --health-port={{ .Values.controller.livenessProbe.healthPort }}
+            - --http-endpoint=localhost:{{ .Values.controller.livenessProbe.healthPort }}
           imagePullPolicy: {{ .Values.image.livenessProbe.pullPolicy }}
           volumeMounts:
             - name: socket-dir
@@ -114,17 +114,15 @@ spec:
             - "--cloud-config-secret-namespace={{ .Values.controller.cloudConfigSecretNamespace }}"
             - "--allow-empty-cloud-config={{ .Values.controller.allowEmptyCloudConfig }}"
           ports:
-            - containerPort: {{ .Values.controller.livenessProbe.healthPort }}
-              name: healthz
-              protocol: TCP
             - containerPort: {{ .Values.controller.metricsPort }}
               name: metrics
               protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
+              host: localhost
               path: /healthz
-              port: healthz
+              port: {{ .Values.controller.livenessProbe.healthPort }}
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

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

@@ -174,15 +174,12 @@ spec:
             - "--allow-inline-volume-key-access-with-idenitity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
             - "--enable-aznfs-mount={{ .Values.node.enableAznfsMount }}"
             - "--metrics-address=0.0.0.0:{{ .Values.node.metricsPort }}"
-          ports:
-            - containerPort: {{ .Values.node.livenessProbe.healthPort }}
-              name: healthz
-              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
+              host: localhost
               path: /healthz
-              port: healthz
+              port: {{ .Values.node.livenessProbe.healthPort }}
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

charts/latest/blob-csi-driver/templates/csi-blob-node.yaml

@@ -62,7 +62,7 @@ spec:
           args:
             - --csi-address=/csi/csi.sock
             - --probe-timeout=3s
-            - --health-port=29632
+            - --http-endpoint=localhost:29632
           volumeMounts:
             - name: socket-dir
               mountPath: /csi
@@ -81,17 +81,15 @@ spec:
             - "--metrics-address=0.0.0.0:29634"
             - "--user-agent-suffix=OSS-kubectl"
           ports:
-            - containerPort: 29632
-              name: healthz
-              protocol: TCP
             - containerPort: 29634
               name: metrics
               protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
+              host: localhost
               path: /healthz
-              port: healthz
+              port: 29632
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

deploy/csi-blob-controller.yaml

@@ -131,15 +131,12 @@ spec:
             - "--user-agent-suffix=OSS-kubectl"
             - "--metrics-address=0.0.0.0:29635"
             - "--enable-aznfs-mount=true"
-          ports:
-            - containerPort: 29633
-              name: healthz
-              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
+              host: localhost
               path: /healthz
-              port: healthz
+              port: 29633
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30