From 1e0bd66108410812b800b90991c6ee39004c2d7c Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Tue, 20 Sep 2022 16:07:14 +0530 Subject: [PATCH] rbd: make default fstype explicit to ext4 With the attacher sidecar update to v4.0.0 this has to be set explictly. Signed-off-by: Humble Chirammal --- build.env | 2 +- charts/ceph-csi-rbd/README.md | 2 +- charts/ceph-csi-rbd/templates/provisioner-deployment.yaml | 1 + charts/ceph-csi-rbd/values.yaml | 2 +- deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml | 3 ++- 5 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build.env b/build.env index 7932f74a6..6628aaf4b 100644 --- a/build.env +++ b/build.env @@ -48,7 +48,7 @@ ROOK_VERSION=v1.9.8 ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v17 # CSI sidecar version -CSI_ATTACHER_VERSION=v3.5.0 +CSI_ATTACHER_VERSION=v4.0.0 CSI_SNAPSHOTTER_VERSION=v6.0.1 CSI_RESIZER_VERSION=v1.6.0 CSI_PROVISIONER_VERSION=v3.2.1 diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index 48574067e..35b4c3291 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -121,7 +121,7 @@ charts and their default values. | `provisioner.provisioner.image.tag` | Specifies image tag | `v3.2.1` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.attacher.image.repository` | Specifies the csi-attacher image repository URL | `registry.k8s.io/sig-storage/csi-attacher` | -| `provisioner.attacher.image.tag` | Specifies image tag | `v3.5.0` | +| `provisioner.attacher.image.tag` | Specifies image tag | `v4.0.0` | | `provisioner.attacher.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.attacher.name` | Specifies the name of csi-attacher sidecar | `attacher` | | `provisioner.attacher.enabled` | Specifies whether attacher sidecar is enabled | `true` | diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 9e3b30f3e..f425b174d 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -124,6 +124,7 @@ spec: - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" + - "--default-fstype=ext4" 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 d05dcd414..04d5c628a 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -216,7 +216,7 @@ provisioner: enabled: true image: repository: registry.k8s.io/sig-storage/csi-attacher - tag: v3.5.0 + tag: v4.0.0 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 600faada8..9e88a67a0 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -84,12 +84,13 @@ spec: - name: socket-dir mountPath: /csi - name: csi-attacher - image: registry.k8s.io/sig-storage/csi-attacher:v3.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.0.0 args: - "--v=1" - "--csi-address=$(ADDRESS)" - "--leader-election=true" - "--retry-interval-start=500ms" + - "--default-fstype=ext4" env: - name: ADDRESS value: /csi/csi-provisioner.sock