Merge pull request #1814 from kubernetes-sigs/revert-win-http-endpoint

andyzhangx · web-flow · commit 7a5435fb191f · 2024-04-10T14:41:10.000+08:00
fix: revert http-endpoint change on windows daemonset
diff --git a/charts/latest/azurefile-csi-driver-v0.0.0.tgz b/charts/latest/azurefile-csi-driver-v0.0.0.tgz
diff --git a/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml b/charts/latest/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml
@@ -73,7 +73,7 @@ spec:
           args:
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--probe-timeout=3s"
-            - "--http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}"
+            - "--health-port={{ .Values.node.livenessProbe.healthPort }}"
             - "--v=2"
           env:
             - name: CSI_ENDPOINT
@@ -138,12 +138,15 @@ spec:
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
             - "--allow-inline-volume-key-access-with-identity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
             - "--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: {{ .Values.node.livenessProbe.healthPort }}
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
diff --git a/charts/v1.29.2/azurefile-csi-driver-v1.29.2.tgz b/charts/v1.29.2/azurefile-csi-driver-v1.29.2.tgz
diff --git a/charts/v1.29.2/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml b/charts/v1.29.2/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml
@@ -73,7 +73,7 @@ spec:
           args:
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--probe-timeout=3s"
-            - "--http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}"
+            - "--health-port={{ .Values.node.livenessProbe.healthPort }}"
             - "--v=2"
           env:
             - name: CSI_ENDPOINT
@@ -138,12 +138,15 @@ spec:
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
             - "--allow-inline-volume-key-access-with-identity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
             - "--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: {{ .Values.node.livenessProbe.healthPort }}
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
diff --git a/charts/v1.30.0/azurefile-csi-driver-v1.30.0.tgz b/charts/v1.30.0/azurefile-csi-driver-v1.30.0.tgz
diff --git a/charts/v1.30.0/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml b/charts/v1.30.0/azurefile-csi-driver/templates/csi-azurefile-node-windows.yaml
@@ -73,7 +73,7 @@ spec:
           args:
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--probe-timeout=3s"
-            - "--http-endpoint=localhost:{{ .Values.node.livenessProbe.healthPort }}"
+            - "--health-port={{ .Values.node.livenessProbe.healthPort }}"
             - "--v=2"
           env:
             - name: CSI_ENDPOINT
@@ -138,12 +138,15 @@ spec:
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
             - "--allow-inline-volume-key-access-with-identity={{ .Values.node.allowInlineVolumeKeyAccessWithIdentity }}"
             - "--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: {{ .Values.node.livenessProbe.healthPort }}
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
diff --git a/deploy/csi-azurefile-node-windows.yaml b/deploy/csi-azurefile-node-windows.yaml
@@ -46,7 +46,7 @@ spec:
           args:
             - --csi-address=$(CSI_ENDPOINT)
             - --probe-timeout=3s
-            - --http-endpoint=localhost:29613
+            - --health-port=29613
             - --v=2
           env:
             - name: CSI_ENDPOINT
@@ -101,12 +101,15 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - --metrics-address="0.0.0.0:29615"
+          ports:
+            - containerPort: 29613
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
-              port: 29613
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
diff --git a/deploy/v1.29.2/csi-azurefile-node-windows.yaml b/deploy/v1.29.2/csi-azurefile-node-windows.yaml
@@ -46,7 +46,7 @@ spec:
           args:
             - --csi-address=$(CSI_ENDPOINT)
             - --probe-timeout=3s
-            - --http-endpoint=localhost:29613
+            - --health-port=localhost:29613
             - --v=2
           env:
             - name: CSI_ENDPOINT
@@ -101,12 +101,15 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - --metrics-address="0.0.0.0:29615"
+          ports:
+            - containerPort: 29613
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
-              port: 29613
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
diff --git a/deploy/v1.30.0/csi-azurefile-node-windows.yaml b/deploy/v1.30.0/csi-azurefile-node-windows.yaml
@@ -46,7 +46,7 @@ spec:
           args:
             - --csi-address=$(CSI_ENDPOINT)
             - --probe-timeout=3s
-            - --http-endpoint=localhost:29613
+            - --health-port=localhost:29613
             - --v=2
           env:
             - name: CSI_ENDPOINT
@@ -101,12 +101,15 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - --metrics-address="0.0.0.0:29615"
+          ports:
+            - containerPort: 29613
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
-              port: 29613
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30
