From c86297b2a88581c9322a31ea14beae7f77993714 Mon Sep 17 00:00:00 2001 From: oriyarde Date: Wed, 14 Oct 2020 21:36:01 +0300 Subject: [PATCH 1/6] update sidecars location, arch and version --- .../crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml | 30 +++++---- .../csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml | 67 ------------------- ...operator.v1.4.0.clusterserviceversion.yaml | 26 +++---- ...operator.v1.4.0.clusterserviceversion.yaml | 20 +++--- 4 files changed, 41 insertions(+), 102 deletions(-) delete mode 100644 deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml diff --git a/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml b/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml index d2572f42a..4476d84e3 100644 --- a/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml +++ b/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr.yaml @@ -8,8 +8,8 @@ metadata: app.kubernetes.io/instance: ibm-block-csi-operator app.kubernetes.io/managed-by: ibm-block-csi-operator spec: - # controller is a statefulSet with ibm-block-csi-driver-controller - # container and csi-provisioner, csi-attacher and livenessprobe sidecars. + # controller is a statefulSet with ibm-block-csi-controller container + # and csi-provisioner, csi-attacher, csi-snapshotter and livenessprobe sidecars. controller: repository: ibmcom/ibm-block-csi-driver-controller tag: "1.4.0" @@ -23,8 +23,10 @@ spec: operator: In values: - amd64 + - s390x + - ppc64le - # node is a daemonSet with ibm-block-csi-driver-node container + # node is a daemonSet with ibm-block-csi-node container # and csi-node-driver-registrar and livenessprobe sidecars. node: repository: ibmcom/ibm-block-csi-driver-node @@ -39,6 +41,8 @@ spec: operator: In values: - amd64 + - s390x + - ppc64le # tolerations: # - effect: NoSchedule @@ -47,24 +51,24 @@ spec: sidecars: - name: csi-node-driver-registrar - repository: quay.io/k8scsi/csi-node-driver-registrar - tag: "v1.2.0" + repository: k8s.gcr.io/sig-storage/csi-node-driver-registrar + tag: "v2.0.1" imagePullPolicy: IfNotPresent - name: csi-provisioner - repository: quay.io/k8scsi/csi-provisioner - tag: "v1.6.0" + repository: k8s.gcr.io/sig-storage/csi-provisioner + tag: "v2.0.2" imagePullPolicy: IfNotPresent - name: csi-attacher - repository: quay.io/k8scsi/csi-attacher - tag: "v2.2.0" + repository: k8s.gcr.io/sig-storage/csi-attacher + tag: "v3.0.0" imagePullPolicy: IfNotPresent - name: csi-snapshotter - repository: quay.io/k8scsi/csi-snapshotter - tag: "v2.1.0" + repository: k8s.gcr.io/sig-storage/csi-snapshotter + tag: "v3.0.0" imagePullPolicy: IfNotPresent - name: livenessprobe - repository: quay.io/k8scsi/livenessprobe - tag: "v2.0.0" + repository: k8s.gcr.io/sig-storage/livenessprobe + tag: "v2.1.0" imagePullPolicy: IfNotPresent # imagePullSecrets: diff --git a/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml b/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml deleted file mode 100644 index 600898676..000000000 --- a/deploy/crds/csi.ibm.com_v1_ibmblockcsi_cr_ocp.yaml +++ /dev/null @@ -1,67 +0,0 @@ -apiVersion: csi.ibm.com/v1 -kind: IBMBlockCSI -metadata: - name: ibm-block-csi - namespace: default - labels: - app.kubernetes.io/name: ibm-block-csi-operator - app.kubernetes.io/instance: ibm-block-csi-operator - app.kubernetes.io/managed-by: ibm-block-csi-operator -spec: - # controller is a statefulSet with ibm-block-csi-driver-controller - # container and csi-provisioner, csi-attacher and livenessprobe sidecars. - controller: - repository: ibmcom/ibm-block-csi-driver-controller - tag: "1.4.0" - imagePullPolicy: IfNotPresent - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - s390x - - ppc64le - - # node is a daemonSet with ibm-block-csi-driver-node container - # and csi-node-driver-registrar and livenessprobe sidecars. - node: - repository: ibmcom/ibm-block-csi-driver-node - tag: "1.4.0" - imagePullPolicy: IfNotPresent - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - s390x - - ppc64le - - sidecars: - - name: csi-node-driver-registrar - repository: registry.redhat.io/openshift4/ose-csi-driver-registrar - tag: v4.3 - imagePullPolicy: IfNotPresent - - name: csi-provisioner - repository: registry.redhat.io/openshift4/ose-csi-external-provisioner-rhel7 - tag: v4.4 - imagePullPolicy: IfNotPresent - - name: csi-attacher - repository: registry.redhat.io/openshift4/ose-csi-external-attacher - tag: v4.4 - imagePullPolicy: IfNotPresent - - name: csi-snapshotter - repository: registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel7 - tag: v4.4 - imagePullPolicy: IfNotPresent - - name: livenessprobe - repository: registry.redhat.io/openshift4/ose-csi-livenessprobe - tag: v4.4 - imagePullPolicy: IfNotPresent diff --git a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index f3407aed4..1d2636ae0 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -36,7 +36,8 @@ metadata: "operator": "In", "values": [ "amd64", - "s390x" + "s390x", + "ppc64le" ] } ] @@ -61,7 +62,8 @@ metadata: "operator": "In", "values": [ "amd64", - "s390x" + "s390x", + "ppc64le" ] } ] @@ -74,32 +76,32 @@ metadata: "sidecars": [ { "name": "csi-node-driver-registrar", - "repository": "quay.io/k8scsi/csi-node-driver-registrar", - "tag": "v1.2.0", + "repository": "k8s.gcr.io/sig-storage/csi-node-driver-registrar", + "tag": "v2.0.1", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-provisioner", - "repository": "quay.io/k8scsi/csi-provisioner", - "tag": "v1.6.0", + "repository": "k8s.gcr.io/sig-storage/csi-provisioner", + "tag": "v2.0.2", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-attacher", - "repository": "quay.io/k8scsi/csi-attacher", - "tag": "v2.2.0", + "repository": "k8s.gcr.io/sig-storage/csi-attacher", + "tag": "v3.0.0", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-snapshotter", - "repository": "quay.io/k8scsi/csi-snapshotter", - "tag": "v2.1.0", + "repository": "k8s.gcr.io/sig-storage/csi-snapshotter", + "tag": "v3.0.0", "imagePullPolicy": "IfNotPresent" }, { "name": "livenessprobe", - "repository": "quay.io/k8scsi/livenessprobe", - "tag": "v2.0.0", + "repository": "k8s.gcr.io/sig-storage/livenessprobe", + "tag": "v2.1.0", "imagePullPolicy": "IfNotPresent" } ] diff --git a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index 7ff6e64f7..41dd2d0cd 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -74,32 +74,32 @@ metadata: "sidecars": [ { "name": "csi-node-driver-registrar", - "repository": "registry.redhat.io/openshift4/ose-csi-driver-registrar", - "tag": "v4.3", + "repository": "k8s.gcr.io/sig-storage/csi-node-driver-registrar", + "tag": "v2.0.1", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-provisioner", - "repository": "registry.redhat.io/openshift4/ose-csi-external-provisioner-rhel7", - "tag": "v4.4", + "repository": "k8s.gcr.io/sig-storage/csi-provisioner", + "tag": "v2.0.2", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-attacher", - "repository": "registry.redhat.io/openshift4/ose-csi-external-attacher", - "tag": "v4.4", + "repository": "k8s.gcr.io/sig-storage/csi-attacher", + "tag": "v3.0.0", "imagePullPolicy": "IfNotPresent" }, { "name": "csi-snapshotter", - "repository": "registry.redhat.io/openshift4/ose-csi-external-snapshotter-rhel7", - "tag": "v4.4", + "repository": "k8s.gcr.io/sig-storage/csi-snapshotter", + "tag": "v3.0.0", "imagePullPolicy": "IfNotPresent" }, { "name": "livenessprobe", - "repository": "registry.redhat.io/openshift4/ose-csi-livenessprobe", - "tag": "v4.4", + "repository": "k8s.gcr.io/sig-storage/livenessprobe", + "tag": "v2.1.0", "imagePullPolicy": "IfNotPresent" } ] From 91364553006f65dbd0aa4a43bc9c05af705bd3ee Mon Sep 17 00:00:00 2001 From: oriyarde Date: Sun, 8 Nov 2020 15:00:42 +0200 Subject: [PATCH 2/6] update attacher cluster role --- .../ibmblockcsi/static_resource_generator.go | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkg/internal/ibmblockcsi/static_resource_generator.go b/pkg/internal/ibmblockcsi/static_resource_generator.go index b3b2cfafb..5d90c5691 100644 --- a/pkg/internal/ibmblockcsi/static_resource_generator.go +++ b/pkg/internal/ibmblockcsi/static_resource_generator.go @@ -35,6 +35,7 @@ const ( persistentVolumesResource string = "persistentvolumes" persistentVolumeClaimsResource string = "persistentvolumeclaims" volumeAttachmentsResource string = "volumeattachments" + volumeAttachmentsStatusResource string = "volumeattachments/status" volumeSnapshotClassesResource string = "volumesnapshotclasses" volumeSnapshotsResource string = "volumesnapshots" volumeSnapshotsStatusResource string = "volumesnapshots/status" @@ -176,8 +177,8 @@ func (c *IBMBlockCSI) GenerateExternalAttacherClusterRole() *rbacv1.ClusterRole Rules: []rbacv1.PolicyRule{ { APIGroups: []string{""}, - Resources: []string{"persistentvolumes"}, - Verbs: []string{verbGet, verbList, verbWatch, verbUpdate, verbPatch}, + Resources: []string{persistentVolumesResource}, + Verbs: []string{verbGet, verbList, verbWatch, verbPatch}, }, { APIGroups: []string{storageApiGroup}, @@ -185,14 +186,14 @@ func (c *IBMBlockCSI) GenerateExternalAttacherClusterRole() *rbacv1.ClusterRole Verbs: []string{verbGet, verbList, verbWatch}, }, { - APIGroups: []string{""}, - Resources: []string{nodesResource}, - Verbs: []string{verbGet, verbList, verbWatch}, + APIGroups: []string{storageApiGroup}, + Resources: []string{volumeAttachmentsResource}, + Verbs: []string{verbGet, verbList, verbWatch, verbPatch}, }, { APIGroups: []string{storageApiGroup}, - Resources: []string{volumeAttachmentsResource}, - Verbs: []string{verbGet, verbList, verbWatch, verbUpdate, verbPatch}, + Resources: []string{volumeAttachmentsStatusResource}, + Verbs: []string{verbPatch}, }, }, } From 378ffb5ff6204b7cb9d908815c28153570af0737 Mon Sep 17 00:00:00 2001 From: oriyarde Date: Mon, 9 Nov 2020 14:03:22 +0200 Subject: [PATCH 3/6] operator permissions to grant attacher permissions --- deploy/installer/generated/ibm-block-csi-operator.yaml | 6 ++++++ ...ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml | 6 ++++++ ...ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml | 6 ++++++ deploy/role.yaml | 6 ++++++ 4 files changed, 24 insertions(+) diff --git a/deploy/installer/generated/ibm-block-csi-operator.yaml b/deploy/installer/generated/ibm-block-csi-operator.yaml index 1f79be51b..5beb22eba 100644 --- a/deploy/installer/generated/ibm-block-csi-operator.yaml +++ b/deploy/installer/generated/ibm-block-csi-operator.yaml @@ -1590,6 +1590,12 @@ rules: - watch - update - patch +- apiGroups: + - storage.k8s.io + resources: + - volumeattachments/status + verbs: + - patch - apiGroups: - storage.k8s.io resources: diff --git a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index 1d2636ae0..56ddff990 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -602,6 +602,12 @@ spec: - watch - update - patch + - apiGroups: + - storage.k8s.io + resources: + - volumeattachments/status + verbs: + - patch - apiGroups: - storage.k8s.io resources: diff --git a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index 41dd2d0cd..f3c622d31 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -600,6 +600,12 @@ spec: - watch - update - patch + - apiGroups: + - storage.k8s.io + resources: + - volumeattachments/status + verbs: + - patch - apiGroups: - storage.k8s.io resources: diff --git a/deploy/role.yaml b/deploy/role.yaml index 44dcd8e8c..0af1d20c9 100644 --- a/deploy/role.yaml +++ b/deploy/role.yaml @@ -110,6 +110,12 @@ rules: - watch - update - patch +- apiGroups: + - storage.k8s.io + resources: + - volumeattachments/status + verbs: + - patch - apiGroups: - storage.k8s.io resources: From aad53f7f66f6e9faca0ee5d63cc8727a51ebea75 Mon Sep 17 00:00:00 2001 From: oriyarde Date: Mon, 9 Nov 2020 16:11:50 +0200 Subject: [PATCH 4/6] add provisioner permissions --- .../ibmblockcsi/static_resource_generator.go | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkg/internal/ibmblockcsi/static_resource_generator.go b/pkg/internal/ibmblockcsi/static_resource_generator.go index 5d90c5691..f9effb22f 100644 --- a/pkg/internal/ibmblockcsi/static_resource_generator.go +++ b/pkg/internal/ibmblockcsi/static_resource_generator.go @@ -135,6 +135,16 @@ func (c *IBMBlockCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterRo Resources: []string{eventsResource}, Verbs: []string{verbList, verbWatch, verbCreate, verbUpdate, verbPatch}, }, + { + APIGroups: []string{snapshotStorageApiGroup}, + Resources: []string{volumeSnapshotsResource}, + Verbs: []string{verbGet, verbList}, + }, + { + APIGroups: []string{snapshotStorageApiGroup}, + Resources: []string{volumeSnapshotContentsResource}, + Verbs: []string{verbGet, verbList}, + }, { APIGroups: []string{storageApiGroup}, Resources: []string{csiNodesResource}, @@ -145,6 +155,11 @@ func (c *IBMBlockCSI) GenerateExternalProvisionerClusterRole() *rbacv1.ClusterRo Resources: []string{nodesResource}, Verbs: []string{verbGet, verbList, verbWatch}, }, + { + APIGroups: []string{storageApiGroup}, + Resources: []string{volumeAttachmentsResource}, + Verbs: []string{verbGet, verbList, verbWatch}, + }, }, } } From b10bedfc07109fa4588a1743e2b0ddb59fd2c6c8 Mon Sep 17 00:00:00 2001 From: oriyarde Date: Mon, 9 Nov 2020 17:00:58 +0200 Subject: [PATCH 5/6] remove unnecessary snapshotter permissions --- .../generated/ibm-block-csi-operator.yaml | 6 ---- ...operator.v1.4.0.clusterserviceversion.yaml | 6 ---- ...operator.v1.4.0.clusterserviceversion.yaml | 6 ---- deploy/role.yaml | 6 ---- .../ibmblockcsi/static_resource_generator.go | 33 ------------------- 5 files changed, 57 deletions(-) diff --git a/deploy/installer/generated/ibm-block-csi-operator.yaml b/deploy/installer/generated/ibm-block-csi-operator.yaml index 5beb22eba..4669537d5 100644 --- a/deploy/installer/generated/ibm-block-csi-operator.yaml +++ b/deploy/installer/generated/ibm-block-csi-operator.yaml @@ -1695,12 +1695,6 @@ rules: - watch - list - update -- apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshots/status - verbs: - - update --- kind: ClusterRoleBinding diff --git a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index 56ddff990..edc0b481f 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator-community/1.4.0/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -707,12 +707,6 @@ spec: - watch - list - update - - apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshots/status - verbs: - - update deployments: - name: ibm-block-csi-operator diff --git a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml index f3c622d31..41fbe7be0 100644 --- a/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml +++ b/deploy/olm-catalog/ibm-block-csi-operator/ibm-block-csi-operator.v1.4.0.clusterserviceversion.yaml @@ -705,12 +705,6 @@ spec: - watch - list - update - - apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshots/status - verbs: - - update deployments: - name: ibm-block-csi-operator diff --git a/deploy/role.yaml b/deploy/role.yaml index 0af1d20c9..aedc80478 100644 --- a/deploy/role.yaml +++ b/deploy/role.yaml @@ -215,9 +215,3 @@ rules: - watch - list - update -- apiGroups: - - snapshot.storage.k8s.io - resources: - - volumesnapshots/status - verbs: - - update diff --git a/pkg/internal/ibmblockcsi/static_resource_generator.go b/pkg/internal/ibmblockcsi/static_resource_generator.go index f9effb22f..292898539 100644 --- a/pkg/internal/ibmblockcsi/static_resource_generator.go +++ b/pkg/internal/ibmblockcsi/static_resource_generator.go @@ -28,7 +28,6 @@ import ( const ( snapshotStorageApiGroup string = "snapshot.storage.k8s.io" securityOpenshiftApiGroup string = "security.openshift.io" - apiExtensionsApiGroup string = "apiextensions.k8s.io" storageApiGroup string = "storage.k8s.io" rbacAuthorizationApiGroup string = "rbac.authorization.k8s.io" storageClassesResource string = "storageclasses" @@ -38,7 +37,6 @@ const ( volumeAttachmentsStatusResource string = "volumeattachments/status" volumeSnapshotClassesResource string = "volumesnapshotclasses" volumeSnapshotsResource string = "volumesnapshots" - volumeSnapshotsStatusResource string = "volumesnapshots/status" volumeSnapshotContentsResource string = "volumesnapshotcontents" volumeSnapshotContentsStatusResource string = "volumesnapshotcontents/status" eventsResource string = "events" @@ -46,7 +44,6 @@ const ( csiNodesResource string = "csinodes" secretsResource string = "secrets" securityContextConstraintsResource string = "securitycontextconstraints" - customResourceDefinitionsResource string = "customresourcedefinitions" verbGet string = "get" verbList string = "list" verbWatch string = "watch" @@ -240,21 +237,6 @@ func (c *IBMBlockCSI) GenerateExternalSnapshotterClusterRole() *rbacv1.ClusterRo Name: config.GetNameForResource(config.ExternalSnapshotterClusterRole, c.Name), }, Rules: []rbacv1.PolicyRule{ - { - APIGroups: []string{""}, - Resources: []string{persistentVolumesResource}, - Verbs: []string{verbGet, verbList, verbWatch}, - }, - { - APIGroups: []string{""}, - Resources: []string{persistentVolumeClaimsResource}, - Verbs: []string{verbGet, verbList, verbWatch}, - }, - { - APIGroups: []string{storageApiGroup}, - Resources: []string{storageClassesResource}, - Verbs: []string{verbGet, verbList, verbWatch}, - }, { APIGroups: []string{""}, Resources: []string{"events"}, @@ -270,16 +252,6 @@ func (c *IBMBlockCSI) GenerateExternalSnapshotterClusterRole() *rbacv1.ClusterRo Resources: []string{volumeSnapshotClassesResource}, Verbs: []string{verbGet, verbList, verbWatch}, }, - { - APIGroups: []string{snapshotStorageApiGroup}, - Resources: []string{volumeSnapshotsResource}, - Verbs: []string{verbGet, verbList, verbWatch, verbUpdate}, - }, - { - APIGroups: []string{snapshotStorageApiGroup}, - Resources: []string{volumeSnapshotsStatusResource}, - Verbs: []string{verbUpdate}, - }, { APIGroups: []string{snapshotStorageApiGroup}, Resources: []string{volumeSnapshotContentsResource}, @@ -290,11 +262,6 @@ func (c *IBMBlockCSI) GenerateExternalSnapshotterClusterRole() *rbacv1.ClusterRo Resources: []string{volumeSnapshotContentsStatusResource}, Verbs: []string{verbUpdate}, }, - { - APIGroups: []string{apiExtensionsApiGroup}, - Resources: []string{customResourceDefinitionsResource}, - Verbs: []string{verbCreate, verbList, verbWatch, verbDelete}, - }, }, } } From 37ef07b5acb685c517de1f813a416a1a4d97cf05 Mon Sep 17 00:00:00 2001 From: oriyarde Date: Tue, 10 Nov 2020 17:13:17 +0200 Subject: [PATCH 6/6] explicitly keep ext4 as default fstype --- pkg/controller/ibmblockcsi/syncer/csi_controller.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/controller/ibmblockcsi/syncer/csi_controller.go b/pkg/controller/ibmblockcsi/syncer/csi_controller.go index 7a996d7a5..afbf6b5c7 100644 --- a/pkg/controller/ibmblockcsi/syncer/csi_controller.go +++ b/pkg/controller/ibmblockcsi/syncer/csi_controller.go @@ -136,7 +136,7 @@ func (s *csiControllerSyncer) ensureContainersSpec() []corev1.Container { provisioner := s.ensureContainer(provisionerContainerName, s.getCSIProvisionerImage(), // TODO: make timeout configurable - []string{"--csi-address=$(ADDRESS)", "--v=5", "--timeout=30s"}, + []string{"--csi-address=$(ADDRESS)", "--v=5", "--timeout=30s", "--default-fstype=ext4"}, ) provisioner.ImagePullPolicy = s.getCSIProvisionerPullPolicy()