diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index 45f612332..c5a8d5708 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -448,7 +448,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.2.1" +ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0" ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" ROOK_CSI_SNAPSHOTTER_IMAGE: "k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.2" @@ -470,7 +470,7 @@ kubectl --namespace rook-ceph get pod -o jsonpath='{range .items[*]}{range .spec ``` ``` -quay.io/cephcsi/cephcsi:v3.2.1 +quay.io/cephcsi/cephcsi:v3.3.0 k8s.gcr.io/sig-storage/csi-attacher:v3.0.2 k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4 diff --git a/Documentation/helm-operator.md b/Documentation/helm-operator.md index f3584d304..79b024261 100644 --- a/Documentation/helm-operator.md +++ b/Documentation/helm-operator.md @@ -124,7 +124,7 @@ The following tables lists the configurable parameters of the rook-operator char | `csi.rbdLivenessMetricsPort` | Ceph CSI RBD driver metrics port. | `8080` | | `csi.forceCephFSKernelClient` | Enable Ceph Kernel clients on kernel < 4.17 which support quotas for Cephfs. | `true` | | `csi.kubeletDirPath` | Kubelet root directory path (if the Kubelet uses a different path for the `--root-dir` flag) | `/var/lib/kubelet` | -| `csi.cephcsi.image` | Ceph CSI image. | `quay.io/cephcsi/cephcsi:v3.2.0` | +| `csi.cephcsi.image` | Ceph CSI image. | `quay.io/cephcsi/cephcsi:v3.3.0` | | `csi.rbdPluginUpdateStrategy` | CSI Rbd plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `OnDelete` | | `csi.cephFSPluginUpdateStrategy` | CSI CephFS plugin daemonset update strategy, supported values are OnDelete and RollingUpdate. | `OnDelete` | | `csi.registrar.image` | Kubernetes CSI registrar image. | `k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1` | diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index d3e22dddd..9c1f8d9c2 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -33,5 +33,6 @@ v1.6... * for Pacific (16.2.x), Rook is able to update multiple OSD Deployments at the same time to speed up updates and upgrades for larger Ceph clusters * Disable CSI GRPC metrics by default +* Update CephCSI to v3.3.0 * Monitors failover can be [disabled](Documentation/ceph-mon-health.md#failing-over-a-monitor), this is useful for monitor going under planned maintenance where automatic failover is not desired * RGW: Rook has started using deployment's replicatset functionality instead of deploying multiple deployments for each rgw diff --git a/cluster/charts/rook-ceph/values.yaml b/cluster/charts/rook-ceph/values.yaml index e89357cdd..0b0764ab6 100644 --- a/cluster/charts/rook-ceph/values.yaml +++ b/cluster/charts/rook-ceph/values.yaml @@ -264,7 +264,7 @@ csi: #rbdLivenessMetricsPort: 9080 #kubeletDirPath: /var/lib/kubelet #cephcsi: - #image: quay.io/cephcsi/cephcsi:v3.2.1 + #image: quay.io/cephcsi/cephcsi:v3.3.0 #registrar: #image: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1 #provisioner: diff --git a/cluster/examples/kubernetes/ceph/operator-openshift.yaml b/cluster/examples/kubernetes/ceph/operator-openshift.yaml index f7496bf7e..6d6205a5c 100644 --- a/cluster/examples/kubernetes/ceph/operator-openshift.yaml +++ b/cluster/examples/kubernetes/ceph/operator-openshift.yaml @@ -140,7 +140,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.2.1" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0" # ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" diff --git a/cluster/examples/kubernetes/ceph/operator.yaml b/cluster/examples/kubernetes/ceph/operator.yaml index cf8a50d9e..35bdeb7b8 100644 --- a/cluster/examples/kubernetes/ceph/operator.yaml +++ b/cluster/examples/kubernetes/ceph/operator.yaml @@ -64,7 +64,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.2.1" + # ROOK_CSI_CEPH_IMAGE: "quay.io/cephcsi/cephcsi:v3.3.0" # ROOK_CSI_REGISTRAR_IMAGE: "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" # ROOK_CSI_RESIZER_IMAGE: "k8s.gcr.io/sig-storage/csi-resizer:v1.0.1" # ROOK_CSI_PROVISIONER_IMAGE: "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" diff --git a/pkg/operator/ceph/csi/spec.go b/pkg/operator/ceph/csi/spec.go index 811766a74..6e3fa1de5 100644 --- a/pkg/operator/ceph/csi/spec.go +++ b/pkg/operator/ceph/csi/spec.go @@ -105,7 +105,7 @@ var ( // manually challenging. var ( // image names - DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.2.1" + DefaultCSIPluginImage = "quay.io/cephcsi/cephcsi:v3.3.0" DefaultRegistrarImage = "k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.0.1" DefaultProvisionerImage = "k8s.gcr.io/sig-storage/csi-provisioner:v2.0.4" DefaultAttacherImage = "k8s.gcr.io/sig-storage/csi-attacher:v3.0.2" diff --git a/pkg/operator/ceph/csi/version.go b/pkg/operator/ceph/csi/version.go index 8cb82e404..8f978b02c 100644 --- a/pkg/operator/ceph/csi/version.go +++ b/pkg/operator/ceph/csi/version.go @@ -32,7 +32,8 @@ var ( releasev300 = CephCSIVersion{3, 0, 0} releasev310 = CephCSIVersion{3, 1, 0} releasev320 = CephCSIVersion{3, 2, 0} - supportedCSIVersions = []CephCSIVersion{minimum, releaseV210, releasev300, releasev310, releasev320} + releasev330 = CephCSIVersion{3, 3, 0} + supportedCSIVersions = []CephCSIVersion{minimum, releaseV210, releasev300, releasev310, releasev320, releasev330} // omap generator is supported in v3.2.0+ omapSupportedVersions = releasev320 // 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 b298fa34f..fb7d05b99 100644 --- a/pkg/operator/ceph/csi/version_test.go +++ b/pkg/operator/ceph/csi/version_test.go @@ -77,6 +77,11 @@ func TestIsAtLeast(t *testing.T) { ret = testReleaseV300.isAtLeast(&testReleaseV300) assert.Equal(t, true, ret) + // Test for 3.3.0 + // Test version which is lesser + ret = testReleaseV330.isAtLeast(&testReleaseV300) + assert.Equal(t, true, ret) + // Test version which is greater (minor) version = CephCSIVersion{3, 1, 1} ret = testReleaseV300.isAtLeast(&version)