From 8203de06a239a102ede0a0a4555ddbefe8415ac0 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sat, 14 Aug 2021 07:42:25 +0000 Subject: [PATCH] fix: driver register issue on Windows node add back sock removal --- charts/latest/azuredisk-csi-driver-v1.6.0.tgz | Bin 12714 -> 12758 bytes .../templates/csi-azuredisk-node-windows.yaml | 11 ++++++++++- .../templates/csi-azuredisk-node.yaml | 7 +++++++ .../latest/azuredisk-csi-driver/values.yaml | 2 +- deploy/csi-azuredisk-node-windows.yaml | 13 +++++++++++-- deploy/csi-azuredisk-node.yaml | 9 ++++++++- 6 files changed, 37 insertions(+), 5 deletions(-) diff --git a/charts/latest/azuredisk-csi-driver-v1.6.0.tgz b/charts/latest/azuredisk-csi-driver-v1.6.0.tgz index 9e663c230b87df1ff629907af656b9114a01abc8..f2f01fb254a1a4ba37b21a3c5814d5eb26bed524 100644 GIT binary patch delta 12429 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 VIywfyf`NfRIy7zxU^n1k{|koGBP0L- delta 12386 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 HhWh^icsg2+ 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 index 1f5fd85e08..6384733b00 100755 --- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml +++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node-windows.yaml @@ -66,14 +66,23 @@ spec: args: - "--v=2" - "--csi-address=$(CSI_ENDPOINT)" - - "--kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\{{ .Values.driver.name }}\\csi.sock" + - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)" lifecycle: preStop: exec: command: ["cmd", "/c", "del /f C:\\registration\\{{ .Values.driver.name }}-reg.sock C:\\csi\\{{ .Values.driver.name }}\\csi.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar.exe + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 env: - name: CSI_ENDPOINT value: unix://C:\\csi\\csi.sock + - name: DRIVER_REG_SOCK_PATH + value: C:\\var\\lib\\kubelet\\plugins\\{{ .Values.driver.name }}\\csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: diff --git a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml index d8e4837de1..9edbc4ad65 100755 --- a/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml +++ b/charts/latest/azuredisk-csi-driver/templates/csi-azuredisk-node.yaml @@ -73,6 +73,13 @@ spec: preStop: exec: command: ["/bin/sh", "-c", "rm -rf /registration/{{ .Values.driver.name }}-reg.sock /csi/csi.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 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 index 6bdb86776b..29e84292f7 100755 --- a/charts/latest/azuredisk-csi-driver/values.yaml +++ b/charts/latest/azuredisk-csi-driver/values.yaml @@ -21,7 +21,7 @@ image: pullPolicy: IfNotPresent nodeDriverRegistrar: repository: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar - tag: v2.2.0 + tag: v2.3.0 pullPolicy: IfNotPresent serviceAccount: diff --git a/deploy/csi-azuredisk-node-windows.yaml b/deploy/csi-azuredisk-node-windows.yaml index ebcdd19b40..02ca4661b8 100644 --- a/deploy/csi-azuredisk-node-windows.yaml +++ b/deploy/csi-azuredisk-node-windows.yaml @@ -56,18 +56,27 @@ spec: cpu: 10m memory: 20Mi - name: node-driver-registrar - image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.2.0 + image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.3.0 args: - "--v=2" - "--csi-address=$(CSI_ENDPOINT)" - - "--kubelet-registration-path=C:\\var\\lib\\kubelet\\plugins\\disk.csi.azure.com\\csi.sock" + - "--kubelet-registration-path=$(DRIVER_REG_SOCK_PATH)" lifecycle: preStop: exec: command: ["cmd", "/c", "del /f C:\\registration\\disk.csi.azure.com-reg.sock C:\\csi\\disk.csi.azure.com\\csi.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar.exe + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 env: - name: CSI_ENDPOINT value: unix://C:\\csi\\csi.sock + - name: DRIVER_REG_SOCK_PATH + value: C:\\var\\lib\\kubelet\\plugins\\disk.csi.azure.com\\csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: diff --git a/deploy/csi-azuredisk-node.yaml b/deploy/csi-azuredisk-node.yaml index b0f840864e..312362203b 100644 --- a/deploy/csi-azuredisk-node.yaml +++ b/deploy/csi-azuredisk-node.yaml @@ -53,7 +53,7 @@ spec: cpu: 10m memory: 20Mi - name: node-driver-registrar - image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.2.0 + image: mcr.microsoft.com/oss/kubernetes-csi/csi-node-driver-registrar:v2.3.0 args: - --csi-address=$(ADDRESS) - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) @@ -62,6 +62,13 @@ spec: preStop: exec: command: ["/bin/sh", "-c", "rm -rf /registration/disk.csi.azure.com-reg.sock /csi/csi.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 env: - name: ADDRESS value: /csi/csi.sock