diff --git a/Documentation/Helm-Charts/operator-chart.md b/Documentation/Helm-Charts/operator-chart.md index 24ef17d37..756980ef4 100644 --- a/Documentation/Helm-Charts/operator-chart.md +++ b/Documentation/Helm-Charts/operator-chart.md @@ -61,7 +61,7 @@ The following table lists the configurable parameters of the rook-operator chart | `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate | `RollingUpdate` | | `csi.cephFSPluginUpdateStrategyMaxUnavailable` | A maxUnavailable parameter of CSI cephFS plugin daemonset update strategy. | `1` | | `csi.cephcsi.repository` | Ceph CSI image repository | `"quay.io/cephcsi/cephcsi"` | -| `csi.cephcsi.tag` | Ceph CSI image tag | `"v3.11.0"` | +| `csi.cephcsi.tag` | Ceph CSI image tag | `"v3.12.0"` | | `csi.cephfsLivenessMetricsPort` | CSI CephFS driver metrics port | `9081` | | `csi.cephfsPodLabels` | Labels to add to the CSI CephFS Deployments and DaemonSets Pods | `nil` | | `csi.clusterName` | Cluster name identifier to set as metadata on the CephFS subvolume and RBD images. This will be useful in cases like for example, when two container orchestrator clusters (Kubernetes/OCP) are using a single ceph cluster | `nil` | diff --git a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md index 8bab8475c..9b6e986cd 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/ceph-csi-drivers.md @@ -210,10 +210,10 @@ CSI-Addons supports the following operations: Ceph-CSI supports encrypting PersistentVolumeClaims (PVCs) for both RBD and CephFS. This can be achieved using LUKS for RBD and fscrypt for CephFS. More details on encrypting RBD PVCs can be found -[here](https://github.com/ceph/ceph-csi/blob/v3.11.0/docs/deploy-rbd.md#encryption-for-rbd-volumes), +[here](https://github.com/ceph/ceph-csi/blob/v3.12.0/docs/deploy-rbd.md#encryption-for-rbd-volumes), which includes a full list of supported encryption configurations. -More details on encrypting CephFS PVCs can be found [here](https://github.com/ceph/ceph-csi/blob/v3.11.0/docs/deploy-cephfs.md#cephfs-volume-encryption). -A sample KMS configmap can be found [here](https://github.com/ceph/ceph-csi/blob/v3.11.0/examples/kms/vault/kms-config.yaml). +More details on encrypting CephFS PVCs can be found [here](https://github.com/ceph/ceph-csi/blob/v3.12.0/docs/deploy-cephfs.md#cephfs-volume-encryption). +A sample KMS configmap can be found [here](https://github.com/ceph/ceph-csi/blob/v3.12.0/examples/kms/vault/kms-config.yaml). !!! note Not all KMS are compatible with fscrypt. Generally, KMS that either store secrets to use directly (like Vault) diff --git a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md index c723084df..795c4fbab 100644 --- a/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md +++ b/Documentation/Storage-Configuration/Ceph-CSI/custom-images.md @@ -18,7 +18,7 @@ kubectl -n $ROOK_OPERATOR_NAMESPACE edit configmap rook-ceph-operator-config The default upstream images are included below, which you can change to your desired images. ```yaml -ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.11.0" +ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.12.0" ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1" ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.1" ROOK_CSI_ATTACHER_IMAGE: "registry.k8s.io/sig-storage/csi-attacher:v4.5.1" @@ -32,7 +32,7 @@ ROOK_CSIADDONS_IMAGE: "quay.io/csiaddons/k8s-sidecar:v0.9.0" If image version is not passed along with the image name in any of the variables above, Rook will add the corresponding default version to that image. Example: if `ROOK_CSI_CEPH_IMAGE: "quay.io/private-repo/cephcsi"` is passed, -Rook will add internal default version and consume it as `"quay.io/private-repo/cephcsi:v3.11.0"`. +Rook will add internal default version and consume it as `"quay.io/private-repo/cephcsi:v3.12.0"`. ### **Use default images** diff --git a/deploy/charts/rook-ceph/values.yaml b/deploy/charts/rook-ceph/values.yaml index 0544ff109..f20417fa1 100644 --- a/deploy/charts/rook-ceph/values.yaml +++ b/deploy/charts/rook-ceph/values.yaml @@ -487,7 +487,7 @@ csi: # -- Ceph CSI image repository repository: quay.io/cephcsi/cephcsi # -- Ceph CSI image tag - tag: v3.11.0 + tag: v3.12.0 registrar: # -- Kubernetes CSI registrar image repository diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index 6f94d9303..4b6c4d7a1 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,7 +1,7 @@ gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 quay.io/ceph/ceph:v18.2.4 quay.io/ceph/cosi:v0.1.2 - quay.io/cephcsi/cephcsi:v3.11.0 + quay.io/cephcsi/cephcsi:v3.12.0 quay.io/csiaddons/k8s-sidecar:v0.9.0 registry.k8s.io/sig-storage/csi-attacher:v4.5.1 registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 diff --git a/deploy/examples/operator-openshift.yaml b/deploy/examples/operator-openshift.yaml index dd6b37221..ec92ec1d9 100644 --- a/deploy/examples/operator-openshift.yaml +++ b/deploy/examples/operator-openshift.yaml @@ -197,7 +197,7 @@ data: # The default version of CSI supported by Rook will be started. To change the version # of the CSI driver to something other than what is officially supported, change # these images to the desired release of the CSI driver. - # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.11.0" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.12.0" # ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1" # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.10.1" # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.1" diff --git a/deploy/examples/operator.yaml b/deploy/examples/operator.yaml index 41d6116ac..86458948d 100644 --- a/deploy/examples/operator.yaml +++ b/deploy/examples/operator.yaml @@ -124,7 +124,7 @@ data: # The default version of CSI supported by Rook will be started. To change the version # of the CSI driver to something other than what is officially supported, change # these images to the desired release of the CSI driver. - # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.11.0" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.12.0" # ROOK_CSI_REGISTRAR_IMAGE: "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1" # ROOK_CSI_RESIZER_IMAGE: "registry.k8s.io/sig-storage/csi-resizer:v1.10.1" # ROOK_CSI_PROVISIONER_IMAGE: "registry.k8s.io/sig-storage/csi-provisioner:v4.0.1" diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 562ef4bac..814ae1018 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -150,7 +150,7 @@ var ( // manually challenging. var ( // image names - DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.11.0" + DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.12.0" DefaultRegistrarImage = "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1" DefaultProvisionerImage = "registry.k8s.io/sig-storage/csi-provisioner:v4.0.1" DefaultAttacherImage = "registry.k8s.io/sig-storage/csi-attacher:v4.5.1" diff --git a/pkg/operator/ceph/csi/util_test.go b/pkg/operator/ceph/csi/util_test.go index 28b4f8896..2308d426e 100644 --- a/pkg/operator/ceph/csi/util_test.go +++ b/pkg/operator/ceph/csi/util_test.go @@ -284,7 +284,7 @@ func Test_getImage(t *testing.T) { args: args{ data: map[string]string{}, settingName: "ROOK_CSI_CEPH_IMAGE", - defaultImage: "quay.io/cephcsi/cephcsi:v3.11.0", + defaultImage: "quay.io/cephcsi/cephcsi:v3.12.0", }, want: DefaultCSIPluginImage, }, diff --git a/pkg/operator/ceph/csi/version.go b/pkg/operator/ceph/csi/version.go index a3447f4bf..aa4d9bb26 100644 --- a/pkg/operator/ceph/csi/version.go +++ b/pkg/operator/ceph/csi/version.go @@ -26,13 +26,13 @@ import ( var ( //minimum supported version is 3.10.0 - minimum = CephCSIVersion{3, 10, 0} + minimum = CephCSIVersion{3, 11, 0} //supportedCSIVersions are versions that rook supports - releasev311 = CephCSIVersion{3, 11, 0} + releasev312 = CephCSIVersion{3, 12, 0} supportedCSIVersions = []CephCSIVersion{ minimum, - releasev311, + releasev312, } // for parsing the output of `cephcsi` diff --git a/pkg/operator/ceph/csi/version_test.go b/pkg/operator/ceph/csi/version_test.go index 9ccb79d4b..7bd518c6b 100644 --- a/pkg/operator/ceph/csi/version_test.go +++ b/pkg/operator/ceph/csi/version_test.go @@ -23,13 +23,14 @@ import ( ) var ( - testMinVersion = CephCSIVersion{3, 10, 0} + testMinVersion = CephCSIVersion{3, 11, 0} testReleaseV390 = CephCSIVersion{3, 9, 0} testReleaseV391 = CephCSIVersion{3, 9, 1} testreleasev310 = CephCSIVersion{3, 10, 0} testReleaseV3101 = CephCSIVersion{3, 10, 1} testReleaseV3102 = CephCSIVersion{3, 10, 2} testReleaseV3110 = CephCSIVersion{3, 11, 0} + testReleaseV3120 = CephCSIVersion{3, 12, 0} testVersionUnsupported = CephCSIVersion{4, 0, 0} ) @@ -68,6 +69,10 @@ func TestIsAtLeast(t *testing.T) { ret = testReleaseV3110.isAtLeast(&testReleaseV3110) assert.Equal(t, true, ret) + // Test for 3.12.0 + ret = testReleaseV3120.isAtLeast(&testReleaseV3120) + assert.Equal(t, true, ret) + } func TestSupported(t *testing.T) { @@ -86,13 +91,16 @@ func TestSupported(t *testing.T) { assert.Equal(t, false, ret) ret = testreleasev310.Supported() - assert.Equal(t, true, ret) + assert.Equal(t, false, ret) ret = testReleaseV3101.Supported() - assert.Equal(t, true, ret) + assert.Equal(t, false, ret) ret = testReleaseV3110.Supported() assert.Equal(t, true, ret) + + ret = testReleaseV3120.Supported() + assert.Equal(t, true, ret) } func Test_extractCephCSIVersion(t *testing.T) {