Merge pull request #2649 from andyzhangx/cleanup-registrar-livenessPr…

…obe-1.30 [release-1.30] cleanup: remove unused livenessProbe in registrar
kubernetes-sigs · Nov 18, 2024 · 43098aa · 43098aa
2 parents b03d372 + 6c73b7f
commit 43098aa
Show file tree

Hide file tree

Showing 6 changed files with 0 additions and 37 deletions.
diff --git a/charts/latest/azuredisk-csi-driver-v1.30.6.tgz b/charts/latest/azuredisk-csi-driver-v1.30.6.tgz
diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml
@@ -87,16 +87,6 @@ spec:
             - "--v=2"
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
-{{- if .Values.windows.enableRegistrationProbe }}
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar.exe
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 60
-            timeoutSeconds: 30
-{{- end }}
           env:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock

diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml
@@ -96,16 +96,6 @@ spec:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
             - --v=2
-{{- if .Values.linux.enableRegistrationProbe }}
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 30
-            timeoutSeconds: 15
-{{- end }}
           env:
             - name: ADDRESS
               value: /csi/csi.sock

diff --git a/charts/latest/azuredisk-csi-driver/values.yaml b/charts/latest/azuredisk-csi-driver/values.yaml
@@ -186,7 +186,6 @@ linux:
   kubelet: /var/lib/kubelet
   distro: debian # available values: debian, fedora
   enablePerfOptimization: true
-  enableRegistrationProbe: true
   otelTracing:
     enabled: false
     otelServiceName: csi-azuredisk-node

diff --git a/deploy/csi-azuredisk-node-windows.yaml b/deploy/csi-azuredisk-node-windows.yaml
@@ -67,14 +67,6 @@ spec:
             - "--v=2"
             - "--csi-address=$(CSI_ENDPOINT)"
             - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)"
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar.exe
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 60
-            timeoutSeconds: 30
           env:
             - name: CSI_ENDPOINT
               value: unix://C:\\csi\\csi.sock

diff --git a/deploy/csi-azuredisk-node.yaml b/deploy/csi-azuredisk-node.yaml
@@ -64,14 +64,6 @@ spec:
             - --csi-address=$(ADDRESS)
             - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
             - --v=2
-          livenessProbe:
-            exec:
-              command:
-                - /csi-node-driver-registrar
-                - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)
-                - --mode=kubelet-registration-probe
-            initialDelaySeconds: 30
-            timeoutSeconds: 15
           env:
             - name: ADDRESS
               value: /csi/csi.sock