From 2cb8f01a5411fab000a80a2f84f87eb47650ba2f Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 10 Aug 2021 12:29:14 +0200 Subject: [PATCH 1/4] nodeplugin DaemonSet: removed preStop hook in node-driver-registrar This was used to remove the registration socket when the container node-driver-registrar container stops. As of [1] it's done by the registrar itself, making this hook not needed anymore. [1] https://github.com/kubernetes-csi/node-driver-registrar/pull/61 --- .../manila-csi-plugin/templates/nodeplugin-daemonset.yaml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml index d540c412d3..a5962874b3 100644 --- a/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml +++ b/charts/manila-csi-plugin/templates/nodeplugin-daemonset.yaml @@ -33,14 +33,6 @@ spec: args: - "--csi-address=/csi/csi.sock" - "--kubelet-registration-path=/var/lib/kubelet/plugins/{{ printf "%s.%s" .protocolSelector $.Values.driverName | lower }}/csi.sock" - lifecycle: - preStop: - exec: - command: [ - "/bin/sh", "-c", - 'rm -rf /registration/{{ printf "%s.%s" .protocolSelector $.Values.driverName | lower }} - /registration/{{ printf "%s.%s" .protocolSelector $.Values.driverName | lower }}-reg.sock' - ] env: - name: KUBE_NODE_NAME valueFrom: From bb1fe91d5d84943f1a96ad0ce24a68b6fc43c9c3 Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 10 Aug 2021 12:33:11 +0200 Subject: [PATCH 2/4] bumped sidecar versions * csi-node-driver-registrar: v1.3.0 -> v2.2.0 * csi-provisioner: v2.0.2 -> v2.2.2 * csi-snapshotter: v2.1.3 -> v4.1.1 --- charts/manila-csi-plugin/values.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/manila-csi-plugin/values.yaml b/charts/manila-csi-plugin/values.yaml index 1db39db028..ab3f478c52 100644 --- a/charts/manila-csi-plugin/values.yaml +++ b/charts/manila-csi-plugin/values.yaml @@ -54,7 +54,7 @@ nodeplugin: registrar: image: repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar - tag: v1.3.0 + tag: v2.2.0 pullPolicy: IfNotPresent resources: {} nodeSelector: {} @@ -74,14 +74,14 @@ controllerplugin: provisioner: image: repository: k8s.gcr.io/sig-storage/csi-provisioner - tag: v2.0.2 + tag: v2.2.2 pullPolicy: IfNotPresent resources: {} # CSI external-snapshotter container spec snapshotter: image: repository: k8s.gcr.io/sig-storage/csi-snapshotter - tag: v2.1.3 + tag: v4.1.1 pullPolicy: IfNotPresent resources: {} # CSI external-resizer container spec From 22410e3218a8ab58bd5208910464a1bbd5fdfb7d Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Tue, 10 Aug 2021 12:34:08 +0200 Subject: [PATCH 3/4] bumped chart version --- charts/manila-csi-plugin/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/manila-csi-plugin/Chart.yaml b/charts/manila-csi-plugin/Chart.yaml index 206129de23..35342c7e8c 100644 --- a/charts/manila-csi-plugin/Chart.yaml +++ b/charts/manila-csi-plugin/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: latest description: Manila CSI Chart for OpenStack name: openstack-manila-csi -version: 1.3.1 +version: 1.3.2 home: http://github.com/kubernetes/cloud-provider-openstack icon: https://github.com/kubernetes/kubernetes/blob/master/logo/logo.png maintainers: From d7e92d8b86a87ac39b6c8347821ca78daec1317e Mon Sep 17 00:00:00 2001 From: Robert Vasek Date: Thu, 12 Aug 2021 15:54:11 +0200 Subject: [PATCH 4/4] bumped sidecar versions in manifests --- manifests/manila-csi-plugin/csi-controllerplugin.yaml | 4 ++-- manifests/manila-csi-plugin/csi-nodeplugin.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/manifests/manila-csi-plugin/csi-controllerplugin.yaml b/manifests/manila-csi-plugin/csi-controllerplugin.yaml index b5d017e8d2..4218013f7b 100644 --- a/manifests/manila-csi-plugin/csi-controllerplugin.yaml +++ b/manifests/manila-csi-plugin/csi-controllerplugin.yaml @@ -36,7 +36,7 @@ spec: serviceAccountName: openstack-manila-csi-controllerplugin containers: - name: provisioner - image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.2" + image: "k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2" args: - "--csi-address=$(ADDRESS)" # To enable topology awareness in csi-provisioner, uncomment the following line: @@ -49,7 +49,7 @@ spec: - name: plugin-dir mountPath: /var/lib/kubelet/plugins/manila.csi.openstack.org - name: snapshotter - image: "k8s.gcr.io/sig-storage/csi-snapshotter:v2.1.3" + image: "k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1" args: - "--csi-address=$(ADDRESS)" env: diff --git a/manifests/manila-csi-plugin/csi-nodeplugin.yaml b/manifests/manila-csi-plugin/csi-nodeplugin.yaml index 930437c600..b9606d0ded 100644 --- a/manifests/manila-csi-plugin/csi-nodeplugin.yaml +++ b/manifests/manila-csi-plugin/csi-nodeplugin.yaml @@ -21,7 +21,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet containers: - name: registrar - image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v1.3.0" + image: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0" args: - "--csi-address=/csi/csi.sock" - "--kubelet-registration-path=/var/lib/kubelet/plugins/manila.csi.openstack.org/csi.sock"