diff --git a/build.env b/build.env index 88d98bdd0..63948df68 100644 --- a/build.env +++ b/build.env @@ -50,8 +50,8 @@ ROOK_CEPH_CLUSTER_IMAGE=quay.io/ceph/ceph:v17 # CSI sidecar version CSI_ATTACHER_VERSION=v3.5.0 CSI_SNAPSHOTTER_VERSION=v6.0.1 -CSI_PROVISIONER_VERSION=v3.1.0 CSI_RESIZER_VERSION=v1.5.0 +CSI_PROVISIONER_VERSION=v3.2.1 CSI_NODE_DRIVER_REGISTRAR_VERSION=v2.5.1 # e2e settings diff --git a/charts/ceph-csi-cephfs/README.md b/charts/ceph-csi-cephfs/README.md index 51a0b4a15..dc8d28dc5 100644 --- a/charts/ceph-csi-cephfs/README.md +++ b/charts/ceph-csi-cephfs/README.md @@ -109,7 +109,7 @@ charts and their default values. | `provisioner.enableHostNetwork` | Specifies whether hostNetwork is enabled for provisioner pod. | `false` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.1.0` | +| `provisioner.provisioner.image.tag` | Specifies image tag | `v3.2.1` | | `provisioner.provisioner.image.pullPolicy` | Specifies pull policy | `IfNotPresent` | | `provisioner.resizer.image.repository` | Specifies the csi-resizer image repository URL | `registry.k8s.io/sig-storage/csi-resizer` | | `provisioner.resizer.image.tag` | Specifies image tag | `v1.5.0` | diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 5da7f1e73..40ecfea4f 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -63,6 +63,8 @@ spec: - "--leader-election=true" - "--retry-interval-start=500ms" - "--extra-create-metadata=true" + - "--feature-gates=HonorPVReclaimPolicy=true" + - "--prevent-volume-mode-conversion=true" 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 0baea5b8b..7529e07ca 100644 --- a/charts/ceph-csi-cephfs/values.yaml +++ b/charts/ceph-csi-cephfs/values.yaml @@ -171,7 +171,7 @@ provisioner: provisioner: image: repository: registry.k8s.io/sig-storage/csi-provisioner - tag: v3.1.0 + tag: v3.2.1 pullPolicy: IfNotPresent resources: {} diff --git a/charts/ceph-csi-rbd/README.md b/charts/ceph-csi-rbd/README.md index 234c570ca..12ecbf832 100644 --- a/charts/ceph-csi-rbd/README.md +++ b/charts/ceph-csi-rbd/README.md @@ -117,7 +117,7 @@ charts and their default values. | `provisioner.enableHostNetwork` | Specifies whether hostNetwork is enabled for provisioner pod. | `false` | | `provisioner.profiling.enabled` | Specifies whether profiling should be enabled | `false` | | `provisioner.provisioner.image.repository` | Specifies the csi-provisioner image repository URL | `registry.k8s.io/sig-storage/csi-provisioner` | -| `provisioner.provisioner.image.tag` | Specifies image tag | `canary` | +| `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` | diff --git a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml index 3738c3a06..3f81e7631 100644 --- a/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-rbd/templates/provisioner-deployment.yaml @@ -64,6 +64,8 @@ spec: - "--retry-interval-start=500ms" - "--default-fstype={{ .Values.provisioner.defaultFSType }}" - "--extra-create-metadata=true" + - "--feature-gates=HonorPVReclaimPolicy=true" + - "--prevent-volume-mode-conversion=true" {{- if .Values.topology.enabled }} - "--feature-gates=Topology=true" {{- end }} diff --git a/charts/ceph-csi-rbd/values.yaml b/charts/ceph-csi-rbd/values.yaml index 8b3970570..e84baf497 100644 --- a/charts/ceph-csi-rbd/values.yaml +++ b/charts/ceph-csi-rbd/values.yaml @@ -205,12 +205,8 @@ provisioner: provisioner: image: - # TODO: replace with released image version. - # canary image is being to be used to test pvc-pvc clone - # with differe sc feature. - # see: https://github.com/kubernetes-csi/external-provisioner/pull/699 repository: gcr.io/k8s-staging-sig-storage/csi-provisioner - tag: canary + tag: v3.2.1 pullPolicy: IfNotPresent resources: {} diff --git a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml index 784494670..dd0af9326 100644 --- a/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml +++ b/deploy/cephfs/kubernetes/csi-cephfsplugin-provisioner.yaml @@ -43,7 +43,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -51,6 +51,8 @@ spec: - "--leader-election=true" - "--retry-interval-start=500ms" - "--feature-gates=Topology=false" + - "--feature-gates=HonorPVReclaimPolicy=true" + - "--prevent-volume-mode-conversion=true" - "--extra-create-metadata=true" env: - name: ADDRESS diff --git a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml index ecfedd17b..360743e9c 100644 --- a/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml +++ b/deploy/nfs/kubernetes/csi-nfsplugin-provisioner.yaml @@ -40,13 +40,17 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: csi-provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.1.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" - "--timeout=150s" - "--leader-election=true" - "--retry-interval-start=500ms" + # TODO: enable the feature-gate once error has been handled in nfs. + # Issue #3230 + # - "--feature-gates=HonorPVReclaimPolicy=true" + - "--prevent-volume-mode-conversion=true" env: - name: ADDRESS value: unix:///csi/csi-provisioner.sock diff --git a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml index 9acc3f9d9..bc18167fe 100644 --- a/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml +++ b/deploy/rbd/kubernetes/csi-rbdplugin-provisioner.yaml @@ -47,11 +47,7 @@ spec: priorityClassName: system-cluster-critical containers: - name: csi-provisioner - # TODO: replace with released image version. - # Canary image is being to be used to test pvc-pvc clone - # with differe sc feature. - # see: https://github.com/kubernetes-csi/external-provisioner/pull/699 - image: gcr.io/k8s-staging-sig-storage/csi-provisioner:canary + image: k8s.gcr.io/sig-storage/csi-provisioner:v3.2.1 args: - "--csi-address=$(ADDRESS)" - "--v=5" @@ -60,6 +56,8 @@ spec: - "--leader-election=true" # set it to true to use topology based provisioning - "--feature-gates=Topology=false" + - "--feature-gates=HonorPVReclaimPolicy=true" + - "--prevent-volume-mode-conversion=true" # if fstype is not specified in storageclass, ext4 is default - "--default-fstype=ext4" - "--extra-create-metadata=true"