From a92d8d7f2e040eab932b30965f32e798203d2d14 Mon Sep 17 00:00:00 2001 From: Mudit Agarwal Date: Wed, 30 Sep 2020 10:28:08 +0530 Subject: [PATCH] deploy: update csi sidecar images This PR makes the changes in csi templates and upgrade documentation required for updating csi sidecar images. Signed-off-by: Mudit Agarwal --- .../templates/provisioner-clusterrole.yaml | 3 +++ .../templates/provisioner-deployment.yaml | 6 +++--- charts/ceph-csi-cephfs/values.yaml | 10 +++++----- .../templates/provisioner-clusterrole.yaml | 3 +++ .../templates/provisioner-deployment.yaml | 6 +++--- charts/ceph-csi-rbd/values.yaml | 10 +++++----- .../kubernetes/csi-cephfsplugin-provisioner.yaml | 16 ++++++++-------- deploy/cephfs/kubernetes/csi-cephfsplugin.yaml | 2 +- .../cephfs/kubernetes/csi-provisioner-rbac.yaml | 3 +++ deploy/rbd/kubernetes/csi-provisioner-rbac.yaml | 3 +++ .../kubernetes/csi-rbdplugin-provisioner.yaml | 14 +++++++------- deploy/rbd/kubernetes/csi-rbdplugin.yaml | 2 +- scripts/minikube.sh | 10 +++++----- 13 files changed, 50 insertions(+), 38 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml index c7d111598..a181837d4 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml @@ -41,6 +41,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] {{- end -}} {{- if semverCompare ">=1.15" .Capabilities.KubeVersion.GitVersion -}} {{- if .Values.provisioner.resizer.enabled }} diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 86e02b437..2236ec3b2 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -50,8 +50,7 @@ spec: - "--csi-address=$(ADDRESS)" - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - - "--enable-leader-election=true" - - "--leader-election-type=leases" + - "--leader-election=true" - "--retry-interval-start=500ms" {{- if .Values.topology.enabled }} - "--feature-gates=Topology=true" @@ -108,9 +107,10 @@ spec: args: - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - - "--csiTimeout={{ .Values.provisioner.timeout }}" + - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election" - "--retry-interval-start=500ms" + - "--handle-volume-inuse-error=false" env: - name: ADDRESS value: "unix:///csi/{{ .Values.provisionerSocketFile }}" diff --git a/charts/ceph-csi-cephfs/values.yaml b/charts/ceph-csi-cephfs/values.yaml index cb0195b62..f50759c4e 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -73,7 +73,7 @@ nodeplugin: registrar: image: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v1.3.0 + tag: v2.0.1 pullPolicy: IfNotPresent resources: {} @@ -139,7 +139,7 @@ provisioner: provisioner: image: repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v1.6.0 + tag: v2.0.4 pullPolicy: IfNotPresent resources: {} @@ -148,7 +148,7 @@ provisioner: enabled: true image: repository: k8s.gcr.io/sig-storage/csi-attacher - tag: v2.2.0 + tag: v3.0.2 pullPolicy: IfNotPresent resources: {} @@ -157,14 +157,14 @@ provisioner: enabled: true image: repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v0.5.0 + tag: v1.0.1 pullPolicy: IfNotPresent resources: {} snapshotter: image: repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v2.1.1 + tag: v3.0.2 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml index 1dc9bdcad..6f6adcd53 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-clusterrole.yaml @@ -32,6 +32,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] {{- end }} - apiGroups: ["snapshot.storage.k8s.io"] resources: ["volumesnapshots"] diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 1c1ef8172..885db29b3 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -50,8 +50,7 @@ spec: - "--csi-address=$(ADDRESS)" - "--v={{ .Values.logLevel }}" - "--timeout={{ .Values.provisioner.timeout }}" - - "--enable-leader-election=true" - - "--leader-election-type=leases" + - "--leader-election=true" - "--retry-interval-start=500ms" {{- if .Values.topology.enabled }} - "--feature-gates=Topology=true" @@ -71,9 +70,10 @@ spec: args: - "--v={{ .Values.logLevel }}" - "--csi-address=$(ADDRESS)" - - "--csiTimeout={{ .Values.provisioner.timeout }}" + - "--timeout={{ .Values.provisioner.timeout }}" - "--leader-election" - "--retry-interval-start=500ms" + - "--handle-volume-inuse-error=false" env: - name: ADDRESS value: "unix:///csi/{{ .Values.provisionerSocketFile }}" diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index a43411b1a..907b77fc3 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -85,7 +85,7 @@ nodeplugin: registrar: image: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v1.3.0 + tag: v2.0.1 pullPolicy: IfNotPresent resources: {} @@ -163,7 +163,7 @@ provisioner: provisioner: image: repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v1.6.0 + tag: v2.0.4 pullPolicy: IfNotPresent resources: {} @@ -172,7 +172,7 @@ provisioner: enabled: true image: repository: k8s.gcr.io/sig-storage/csi-attacher - tag: v2.2.0 + tag: v3.0.2 pullPolicy: IfNotPresent resources: {} @@ -181,14 +181,14 @@ provisioner: enabled: true image: repository: k8s.gcr.io/sig-storage/csi-resizer - tag: v0.5.0 + tag: v1.0.1 pullPolicy: IfNotPresent resources: {} snapshotter: image: repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v2.1.0 + tag: v3.0.2 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 9c898288b..a109c0535 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -42,15 +42,14 @@ spec: serviceAccount: cephfs-csi-provisioner containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 args: - "--csi-address=$(ADDRESS)" - "--v=5" - "--timeout=150s" - - "--enable-leader-election=true" - - "--leader-election-type=leases" + - "--leader-election=true" - "--retry-interval-start=500ms" - - "--feature-gates=Topology=true" + - "--feature-gates=Topology=false" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock @@ -59,13 +58,14 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" - - "--csiTimeout=150s" + - "--timeout=150s" - "--leader-election" - "--retry-interval-start=500ms" + - "--handle-volume-inuse-error=false" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock @@ -74,7 +74,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.1 + image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -90,7 +90,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-cephfsplugin-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.2 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml index f15b2ad56..960d57085 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin.yaml @@ -24,7 +24,7 @@ spec: # created by privileged CSI driver container. securityContext: privileged: true - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 args: - "--v=5" - "--csi-address=/csi/csi.sock" diff --git a/deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml b/deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml index 645f4081c..227e0e854 100644 --- a/deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml +++ b/deploy/cephfs/kubernetes/csi-provisioner-rbac.yaml @@ -40,6 +40,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] - apiGroups: [""] resources: ["persistentvolumeclaims/status"] verbs: ["update", "patch"] diff --git a/deploy/rbd/kubernetes/csi-provisioner-rbac.yaml b/deploy/rbd/kubernetes/csi-provisioner-rbac.yaml index 41c08e420..d06e71842 100644 --- a/deploy/rbd/kubernetes/csi-provisioner-rbac.yaml +++ b/deploy/rbd/kubernetes/csi-provisioner-rbac.yaml @@ -43,6 +43,9 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] - apiGroups: ["storage.k8s.io"] resources: ["csinodes"] verbs: ["get", "list", "watch"] diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 5b5c3baad..009696fd7 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -42,14 +42,13 @@ spec: serviceAccount: rbd-csi-provisioner containers: - name: csi-provisioner - image: k8s.gcr.io/sig-storage/csi-provisioner:v1.6.0 + image: k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 args: - "--csi-address=$(ADDRESS)" - "--v=5" - "--timeout=150s" - "--retry-interval-start=500ms" - - "--enable-leader-election=true" - - "--leader-election-type=leases" + - "--leader-election=true" - "--feature-gates=Topology=true" env: - name: ADDRESS @@ -59,7 +58,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-snapshotter - image: k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.0 + image: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -75,7 +74,7 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: k8s.gcr.io/sig-storage/csi-attacher:v2.2.0 + image: k8s.gcr.io/sig-storage/csi-attacher:v3.0.2 args: - "--v=5" - "--csi-address=$(ADDRESS)" @@ -89,13 +88,14 @@ spec: - name: socket-dir mountPath: /csi - name: csi-resizer - image: k8s.gcr.io/sig-storage/csi-resizer:v0.5.0 + image: k8s.gcr.io/sig-storage/csi-resizer:v1.0.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" - - "--csiTimeout=150s" + - "--timeout=150s" - "--leader-election" - "--retry-interval-start=500ms" + - "--handle-volume-inuse-error=false" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock diff --git a/deploy/rbd/kubernetes/csi-rbdplugin.yaml b/deploy/rbd/kubernetes/csi-rbdplugin.yaml index d9d0c0d7c..4be1e6721 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin.yaml @@ -25,7 +25,7 @@ spec: # created by privileged CSI driver container. securityContext: privileged: true - image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0 + image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 args: - "--v=5" - "--csi-address=/csi/csi.sock" diff --git a/scripts/minikube.sh b/scripts/minikube.sh index 2180afb05..4ab46ace5 100755 --- a/scripts/minikube.sh +++ b/scripts/minikube.sh @@ -284,11 +284,11 @@ cephcsi) ;; k8s-sidecar) echo "copying the kubernetes sidecar images" - copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-attacher:v2.2.0 "${K8S_IMAGE_REPO}"/csi-attacher:v2.2.0 - copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-snapshotter:v2.1.1 $"${K8S_IMAGE_REPO}"/csi-snapshotter:v2.1.1 - copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-provisioner:v1.4.0 "${K8S_IMAGE_REPO}"/csi-provisioner:v1.4.0 - copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.3.0 "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v1.3.0 - copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-resizer:v0.5.0 "${K8S_IMAGE_REPO}"/csi-resizer:v0.5.0 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-attacher:v3.0.2 "${K8S_IMAGE_REPO}"/csi-attacher:v3.0.2 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-snapshotter:v3.0.2 $"${K8S_IMAGE_REPO}"/csi-snapshotter:v3.0.2 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-provisioner:v2.0.4 "${K8S_IMAGE_REPO}"/csi-provisioner:v2.0.4 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v2.0.1 "${K8S_IMAGE_REPO}"/csi-node-driver-registrar:v2.0.1 + copy_image_to_cluster "${K8S_IMAGE_REPO}"/csi-resizer:v1.0.1 "${K8S_IMAGE_REPO}"/csi-resizer:v1.0.1 ;; clean) ${minikube} delete