From 894a110113a4fec15d5f6ec66250a590b73d9642 Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Sun, 15 Aug 2021 07:55:48 +0000 Subject: [PATCH] chore: ugprade to driver-registrar v2.3.0 fix doc --- charts/README.md | 2 +- charts/latest/csi-driver-nfs-v3.0.0.tgz | Bin 3428 -> 3495 bytes .../templates/csi-nfs-node.yaml | 11 ++++++++++- charts/latest/csi-driver-nfs/values.yaml | 2 +- deploy/csi-nfs-node.yaml | 13 +++++++++++-- 5 files changed, 23 insertions(+), 5 deletions(-) diff --git a/charts/README.md b/charts/README.md index 9443b035..b291d4c6 100644 --- a/charts/README.md +++ b/charts/README.md @@ -55,7 +55,7 @@ The following table lists the configurable parameters of the latest NFS CSI Driv | `image.livenessProbe.tag` | liveness-probe docker image tag | `v2.3.0` | | `image.livenessProbe.pullPolicy` | liveness-probe image pull policy | `IfNotPresent` | | `image.nodeDriverRegistrar.repository` | csi-node-driver-registrar docker image | `k8s.gcr.io/sig-storage/csi-node-driver-registrar` | -| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.2.0` | +| `image.nodeDriverRegistrar.tag` | csi-node-driver-registrar docker image tag | `v2.3.0` | | `image.nodeDriverRegistrar.pullPolicy` | csi-node-driver-registrar image pull policy | `IfNotPresent` | | `imagePullSecrets` | Specify docker-registry secret names as an array | [] (does not add image pull secrets to deployed pods) | | `serviceAccount.create` | whether create service account of csi-nfs-controller | `true` | diff --git a/charts/latest/csi-driver-nfs-v3.0.0.tgz b/charts/latest/csi-driver-nfs-v3.0.0.tgz index 90a9e58f0a39d5a84d0e65743941a5dcd48e93cd..29a5ad7d11c97e66765fa8d2c068f1da7055f26c 100644 GIT binary patch delta 3442 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 D$?B$e diff --git a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml index 98504915..b3b3ceeb 100755 --- a/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml +++ b/charts/latest/csi-driver-nfs/templates/csi-nfs-node.yaml @@ -56,11 +56,20 @@ spec: preStop: exec: command: ["/bin/sh", "-c", "rm -rf /registration/csi-nfsplugin /registration/csi-nfsplugin-reg.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 args: - --v=2 - --csi-address=/csi/csi.sock - - --kubelet-registration-path=/var/lib/kubelet/plugins/csi-nfsplugin/csi.sock + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) env: + - name: DRIVER_REG_SOCK_PATH + value: /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: diff --git a/charts/latest/csi-driver-nfs/values.yaml b/charts/latest/csi-driver-nfs/values.yaml index 11c5eeb1..e660c3a5 100755 --- a/charts/latest/csi-driver-nfs/values.yaml +++ b/charts/latest/csi-driver-nfs/values.yaml @@ -13,7 +13,7 @@ image: pullPolicy: IfNotPresent nodeDriverRegistrar: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v2.2.0 + tag: v2.3.0 pullPolicy: IfNotPresent serviceAccount: diff --git a/deploy/csi-nfs-node.yaml b/deploy/csi-nfs-node.yaml index 524f662e..faed5ea6 100644 --- a/deploy/csi-nfs-node.yaml +++ b/deploy/csi-nfs-node.yaml @@ -44,16 +44,25 @@ spec: cpu: 10m memory: 20Mi - name: node-driver-registrar - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 lifecycle: preStop: exec: command: ["/bin/sh", "-c", "rm -rf /registration/csi-nfsplugin /registration/csi-nfsplugin-reg.sock"] + livenessProbe: + exec: + command: + - /csi-node-driver-registrar + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) + - --mode=kubelet-registration-probe + initialDelaySeconds: 3 args: - --v=2 - --csi-address=/csi/csi.sock - - --kubelet-registration-path=/var/lib/kubelet/plugins/csi-nfsplugin/csi.sock + - --kubelet-registration-path=$(DRIVER_REG_SOCK_PATH) env: + - name: DRIVER_REG_SOCK_PATH + value: /var/lib/kubelet/plugins/csi-nfsplugin/csi.sock - name: KUBE_NODE_NAME valueFrom: fieldRef: