From f62e6d9cc2fa85e1b0c8d64382b4555a5530dd7b Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Mon, 14 Apr 2025 12:14:44 -0600 Subject: [PATCH] core: set default ceph version to v19.2.2 Update the examples and docs and operator base image to the latest ceph release v19.2.2. Signed-off-by: Travis Nielsen --- Documentation/CRDs/Cluster/ceph-cluster-crd.md | 12 ++++++------ Documentation/CRDs/Cluster/host-cluster.md | 6 +++--- Documentation/CRDs/Cluster/pvc-cluster.md | 6 +++--- Documentation/CRDs/Cluster/stretch-cluster.md | 2 +- Documentation/Upgrade/ceph-upgrade.md | 10 +++++----- deploy/charts/rook-ceph-cluster/values.yaml | 6 +++--- deploy/examples/cluster-external-management.yaml | 2 +- deploy/examples/cluster-on-local-pvc.yaml | 2 +- deploy/examples/cluster-on-pvc.yaml | 2 +- deploy/examples/cluster-stretched-aws.yaml | 2 +- deploy/examples/cluster-stretched.yaml | 2 +- deploy/examples/cluster.yaml | 4 ++-- deploy/examples/images.txt | 2 +- design/ceph/ceph-cluster-cleanup.md | 2 +- images/ceph/Makefile | 2 +- tests/manifests/test-cluster-on-pvc-encrypted.yaml | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/Documentation/CRDs/Cluster/ceph-cluster-crd.md b/Documentation/CRDs/Cluster/ceph-cluster-crd.md index 0f776f523..99b34f69b 100755 --- a/Documentation/CRDs/Cluster/ceph-cluster-crd.md +++ b/Documentation/CRDs/Cluster/ceph-cluster-crd.md @@ -26,7 +26,7 @@ Settings can be specified at the global level to apply to the cluster as a whole * `external`: * `enable`: if `true`, the cluster will not be managed by Rook but via an external entity. This mode is intended to connect to an existing cluster. In this case, Rook will only consume the external cluster. However, Rook will be able to deploy various daemons in Kubernetes such as object gateways, mds and nfs if an image is provided and will refuse otherwise. If this setting is enabled **all** the other options will be ignored except `cephVersion.image` and `dataDirHostPath`. See [external cluster configuration](external-cluster/external-cluster.md). If `cephVersion.image` is left blank, Rook will refuse the creation of extra CRs like object, file and nfs. * `cephVersion`: The version information for launching the ceph daemons. - * `image`: The image used for running the ceph daemons. For example, `quay.io/ceph/ceph:v19.2.1`. For more details read the [container images section](#ceph-container-images). + * `image`: The image used for running the ceph daemons. For example, `quay.io/ceph/ceph:v19.2.2`. For more details read the [container images section](#ceph-container-images). For the latest ceph images, see the [Ceph DockerHub](https://hub.docker.com/r/ceph/ceph/tags/). To ensure a consistent version of the image is running across all nodes in the cluster, it is recommended to use a very specific image version. Tags also exist that would give the latest version, but they are only recommended for test environments. For example, the tag `v19` will be updated each time a new Squid build is released. @@ -121,8 +121,8 @@ These are general purpose Ceph container with all necessary daemons and dependen | -------------------- | --------------------------------------------------------- | | vRELNUM | Latest release in this series (e.g., **v19** = Squid) | | vRELNUM.Y | Latest stable release in this stable series (e.g., v19.2) | -| vRELNUM.Y.Z | A specific release (e.g., v19.2.1) | -| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v19.2.1-20250202) | +| vRELNUM.Y.Z | A specific release (e.g., v19.2.2) | +| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v19.2.2-20250409) | A specific will contain a specific release of Ceph as well as security fixes from the Operating System. @@ -435,7 +435,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -542,7 +542,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -672,7 +672,7 @@ kubectl -n rook-ceph get CephCluster -o yaml deviceClasses: - name: hdd version: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 version: 16.2.6-0 conditions: - lastHeartbeatTime: "2021-03-02T21:22:11Z" diff --git a/Documentation/CRDs/Cluster/host-cluster.md b/Documentation/CRDs/Cluster/host-cluster.md index a9cd511a2..ec86c08a2 100644 --- a/Documentation/CRDs/Cluster/host-cluster.md +++ b/Documentation/CRDs/Cluster/host-cluster.md @@ -22,7 +22,7 @@ metadata: spec: cephVersion: # see the "Cluster Settings" section below for more details on which image of ceph to run - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -49,7 +49,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -101,7 +101,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/Documentation/CRDs/Cluster/pvc-cluster.md b/Documentation/CRDs/Cluster/pvc-cluster.md index 6485e1e8d..59439f6ea 100644 --- a/Documentation/CRDs/Cluster/pvc-cluster.md +++ b/Documentation/CRDs/Cluster/pvc-cluster.md @@ -18,7 +18,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -72,7 +72,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: false dashboard: enabled: true @@ -128,7 +128,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/Documentation/CRDs/Cluster/stretch-cluster.md b/Documentation/CRDs/Cluster/stretch-cluster.md index bc45459cd..f46494a68 100644 --- a/Documentation/CRDs/Cluster/stretch-cluster.md +++ b/Documentation/CRDs/Cluster/stretch-cluster.md @@ -34,7 +34,7 @@ spec: - name: b - name: c cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: true # Either storageClassDeviceSets or the storage section can be specified for creating OSDs. # This example uses all devices for simplicity. diff --git a/Documentation/Upgrade/ceph-upgrade.md b/Documentation/Upgrade/ceph-upgrade.md index efc1c77d4..c3ba61186 100644 --- a/Documentation/Upgrade/ceph-upgrade.md +++ b/Documentation/Upgrade/ceph-upgrade.md @@ -39,7 +39,7 @@ Official Ceph container images can be found on [Quay](https://quay.io/repository These images are tagged in a few ways: -* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v19.2.1-20250202`). +* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v19.2.2-20250409`). These tags are recommended for production clusters, as there is no possibility for the cluster to be heterogeneous with respect to the version of Ceph running in containers. * Ceph major version tags (e.g., `v19`) are useful for development and test clusters so that the @@ -56,7 +56,7 @@ CephCluster CRD (`spec.cephVersion.image`). ```console ROOK_CLUSTER_NAMESPACE=rook-ceph -NEW_CEPH_IMAGE='quay.io/ceph/ceph:v19.2.1-20250202' +NEW_CEPH_IMAGE='quay.io/ceph/ceph:v19.2.2-20250409' kubectl -n $ROOK_CLUSTER_NAMESPACE patch CephCluster $ROOK_CLUSTER_NAMESPACE --type=merge -p "{\"spec\": {\"cephVersion\": {\"image\": \"$NEW_CEPH_IMAGE\"}}}" ``` @@ -68,7 +68,7 @@ employed by the new Rook operator release. Employing an outdated Ceph version wi in unexpected behaviour. ```console -kubectl -n rook-ceph set image deploy/rook-ceph-tools rook-ceph-tools=quay.io/ceph/ceph:v19.2.1-20250202 +kubectl -n rook-ceph set image deploy/rook-ceph-tools rook-ceph-tools=quay.io/ceph/ceph:v19.2.2-20250409 ``` #### **3. Wait for the pod updates** @@ -86,9 +86,9 @@ Confirm the upgrade is completed when the versions are all on the desired Ceph v kubectl -n $ROOK_CLUSTER_NAMESPACE get deployment -l rook_cluster=$ROOK_CLUSTER_NAMESPACE -o jsonpath='{range .items[*]}{"ceph-version="}{.metadata.labels.ceph-version}{"\n"}{end}' | sort | uniq This cluster is not yet finished: ceph-version=v18.2.4-0 - ceph-version=v19.2.1-0 + ceph-version=v19.2.2-0 This cluster is finished: - ceph-version=v19.2.1-0 + ceph-version=v19.2.2-0 ``` #### **4. Verify cluster health** diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 02d9e77a0..2dfa09b67 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -25,7 +25,7 @@ toolbox: # -- Enable Ceph debugging pod deployment. See [toolbox](../Troubleshooting/ceph-toolbox.md) enabled: false # -- Toolbox image, defaults to the image used by the Ceph cluster - image: #quay.io/ceph/ceph:v19.2.1 + image: #quay.io/ceph/ceph:v19.2.2 # -- Toolbox tolerations tolerations: [] # -- Toolbox affinity @@ -94,9 +94,9 @@ cephClusterSpec: # v18 is Reef, v19 is Squid # RECOMMENDATION: In production, use a specific version tag instead of the general v18 flag, which pulls the latest release and could result in different # versions running within the cluster. See tags available at https://hub.docker.com/r/ceph/ceph/tags/. - # If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.1-20250202 + # If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.2-20250409 # This tag might not contain a new Ceph version, just security fixes from the underlying operating system, which will reduce vulnerabilities - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 # Whether to allow unsupported versions of Ceph. Currently Reef and Squid are supported. # Future versions such as Tentacle (v20) would require this to be set to `true`. # Do not set to true in production. diff --git a/deploy/examples/cluster-external-management.yaml b/deploy/examples/cluster-external-management.yaml index 290e58456..03d20e9ae 100644 --- a/deploy/examples/cluster-external-management.yaml +++ b/deploy/examples/cluster-external-management.yaml @@ -20,4 +20,4 @@ spec: dataDirHostPath: /var/lib/rook # providing an image is required, if you want to create other CRs (rgw, mds, nfs) cephVersion: - image: quay.io/ceph/ceph:v19.2.1 # Should match external cluster version + image: quay.io/ceph/ceph:v19.2.2 # Should match external cluster version diff --git a/deploy/examples/cluster-on-local-pvc.yaml b/deploy/examples/cluster-on-local-pvc.yaml index 73ca094de..9c79125e1 100644 --- a/deploy/examples/cluster-on-local-pvc.yaml +++ b/deploy/examples/cluster-on-local-pvc.yaml @@ -174,7 +174,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-on-pvc.yaml b/deploy/examples/cluster-on-pvc.yaml index c07fd8224..d53ac3bd6 100644 --- a/deploy/examples/cluster-on-pvc.yaml +++ b/deploy/examples/cluster-on-pvc.yaml @@ -34,7 +34,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-stretched-aws.yaml b/deploy/examples/cluster-stretched-aws.yaml index eb742ea00..62b06de3f 100644 --- a/deploy/examples/cluster-stretched-aws.yaml +++ b/deploy/examples/cluster-stretched-aws.yaml @@ -45,7 +45,7 @@ spec: mgr: count: 2 cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: true skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-stretched.yaml b/deploy/examples/cluster-stretched.yaml index 677a8e53d..24a4c1b4e 100644 --- a/deploy/examples/cluster-stretched.yaml +++ b/deploy/examples/cluster-stretched.yaml @@ -39,7 +39,7 @@ spec: mgr: count: 2 cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 allowUnsupported: true skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster.yaml b/deploy/examples/cluster.yaml index 9a6ae45ee..79382e6d6 100644 --- a/deploy/examples/cluster.yaml +++ b/deploy/examples/cluster.yaml @@ -19,9 +19,9 @@ spec: # v18 is Reef, v19 is Squid # RECOMMENDATION: In production, use a specific version tag instead of the general v19 flag, which pulls the latest release and could result in different # versions running within the cluster. See tags available at https://hub.docker.com/r/ceph/ceph/tags/. - # If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.1-20250202 + # If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v19.2.2-20250409 # This tag might not contain a new Ceph version, just security fixes from the underlying operating system, which will reduce vulnerabilities - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 # Whether to allow unsupported versions of Ceph. Currently Reef and Squid are supported. # Future versions such as Tentacle (v20) would require this to be set to `true`. # Do not set to true in production. diff --git a/deploy/examples/images.txt b/deploy/examples/images.txt index dd360bd30..0de066e86 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -1,6 +1,6 @@ docker.io/rook/ceph:master gcr.io/k8s-staging-sig-storage/objectstorage-sidecar:v20240513-v0.1.0-35-gefb3255 - quay.io/ceph/ceph:v19.2.1 + quay.io/ceph/ceph:v19.2.2 quay.io/ceph/cosi:v0.1.2 quay.io/cephcsi/cephcsi:v3.14.0 quay.io/csiaddons/k8s-sidecar:v0.12.0 diff --git a/design/ceph/ceph-cluster-cleanup.md b/design/ceph/ceph-cluster-cleanup.md index c50b8d6d0..a227acb8f 100644 --- a/design/ceph/ceph-cluster-cleanup.md +++ b/design/ceph/ceph-cluster-cleanup.md @@ -34,7 +34,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 962da3c0f..d8fd65daf 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -16,7 +16,7 @@ include ../image.mk # ==================================================================================== # Image Build Options -CEPH_VERSION ?= v19.2.1-20250202 +CEPH_VERSION ?= v19.2.2-20250409 REGISTRY_NAME = quay.io BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph:$(CEPH_VERSION) diff --git a/tests/manifests/test-cluster-on-pvc-encrypted.yaml b/tests/manifests/test-cluster-on-pvc-encrypted.yaml index 941d9f2fa..48f7e6458 100644 --- a/tests/manifests/test-cluster-on-pvc-encrypted.yaml +++ b/tests/manifests/test-cluster-on-pvc-encrypted.yaml @@ -14,7 +14,7 @@ spec: requests: storage: 5Gi cephVersion: - image: quay.io/ceph/ceph:v19.2.1 + image: quay.io/ceph/ceph:v19.2.2 dashboard: enabled: false network: