Merge pull request #768 from andyzhangx/revert-win-http-endpoint

fix: revert http-endpoint change on windows daemonset
kubernetes-csi · Apr 9, 2024 · 0e77d5e · 0e77d5e
2 parents d7d14f1 + 115d385
commit 0e77d5e
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 12 deletions.
diff --git a/charts/latest/csi-driver-smb-v0.0.0.tgz b/charts/latest/csi-driver-smb-v0.0.0.tgz
diff --git a/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/latest/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -50,7 +50,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
@@ -105,12 +105,15 @@ spec:
             - --nodeid=$(KUBE_NODE_NAME)
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
             - "--remove-smb-mapping-during-unmount={{ .Values.windows.removeSMBMappingDuringUnmount }}"
+          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.14.0/csi-driver-smb-v1.14.0.tgz b/charts/v1.14.0/csi-driver-smb-v1.14.0.tgz
diff --git a/charts/v1.14.0/csi-driver-smb/templates/csi-smb-node-windows.yaml b/charts/v1.14.0/csi-driver-smb/templates/csi-smb-node-windows.yaml
@@ -50,7 +50,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
@@ -105,12 +105,15 @@ spec:
             - --nodeid=$(KUBE_NODE_NAME)
             - "--enable-get-volume-stats={{ .Values.feature.enableGetVolumeStats }}"
             - "--remove-smb-mapping-during-unmount={{ .Values.windows.removeSMBMappingDuringUnmount }}"
+          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-smb-node-windows.yaml b/deploy/csi-smb-node-windows.yaml
@@ -37,7 +37,7 @@ spec:
           args:
             - --csi-address=$(CSI_ENDPOINT)
             - --probe-timeout=3s
-            - --http-endpoint=localhost:29643
+            - --health-port=29643
             - --v=2
           env:
             - name: CSI_ENDPOINT
@@ -92,12 +92,15 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - "--remove-smb-mapping-during-unmount=true"
+          ports:
+            - containerPort: 29643
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
-              port: 29643
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30

diff --git a/deploy/v1.14.0/csi-smb-node-windows.yaml b/deploy/v1.14.0/csi-smb-node-windows.yaml
@@ -37,7 +37,7 @@ spec:
           args:
             - --csi-address=$(CSI_ENDPOINT)
             - --probe-timeout=3s
-            - --http-endpoint=localhost:29643
+            - --health-port=29643
             - --v=2
           env:
             - name: CSI_ENDPOINT
@@ -92,12 +92,15 @@ spec:
             - --endpoint=$(CSI_ENDPOINT)
             - --nodeid=$(KUBE_NODE_NAME)
             - "--remove-smb-mapping-during-unmount=true"
+          ports:
+            - containerPort: 29643
+              name: healthz
+              protocol: TCP
           livenessProbe:
             failureThreshold: 5
             httpGet:
-              host: localhost
               path: /healthz
-              port: 29643
+              port: healthz
             initialDelaySeconds: 30
             timeoutSeconds: 10
             periodSeconds: 30