From 87cca6f63cc5871ad13c4109aaed503adcfc9219 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 8 Dec 2021 09:00:03 +0100 Subject: [PATCH] core: bump to ceph 16.2.7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ceph 16.2.7 is out so let's use it in our manifests. Signed-off-by: Sébastien Han (cherry picked from commit 0a918814eab7c0297f500bfbaf53c471244ff60d) --- .../workflows/rgw-multisite-test/action.yml | 2 +- Documentation/ceph-cluster-crd.md | 24 +++++++++---------- Documentation/ceph-upgrade.md | 4 ++-- deploy/charts/rook-ceph-cluster/values.yaml | 2 +- .../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-test.yaml | 2 +- deploy/examples/cluster.yaml | 4 ++-- deploy/examples/images.txt | 2 +- deploy/olm/assemble/metadata-common.yaml | 2 +- design/ceph/ceph-cluster-cleanup.md | 2 +- images/ceph/Makefile | 4 ++-- tests/framework/installer/ceph_installer.go | 2 +- 16 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/rgw-multisite-test/action.yml b/.github/workflows/rgw-multisite-test/action.yml index 938f26d96a9c..ca37c24f777c 100644 --- a/.github/workflows/rgw-multisite-test/action.yml +++ b/.github/workflows/rgw-multisite-test/action.yml @@ -5,7 +5,7 @@ inputs: description: GITHUB_TOKEN from the calling workflow required: true ceph-image: - description: Ceph image to use for the workflow (e.g., quay.io/ceph/ceph:v16.2.5) + description: Ceph image to use for the workflow (e.g., quay.io/ceph/ceph:v16.2.7) required: false runs: diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index 48708033ea40..431352eee0e1 100755 --- a/Documentation/ceph-cluster-crd.md +++ b/Documentation/ceph-cluster-crd.md @@ -32,7 +32,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:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -60,7 +60,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:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -129,7 +129,7 @@ spec: - name: c cephVersion: # Stretch cluster is supported in Ceph Pacific or newer. - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: true # Either storageClassDeviceSets or the storage section can be specified for creating OSDs. # This example uses all devices for simplicity. @@ -167,7 +167,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). 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:v15.2.12` or `v16.2.6`. 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:v15.2.12` or `v16.2.7`. 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 `v15` will be updated each time a new Octopus build is released. @@ -687,7 +687,7 @@ kubectl -n rook-ceph get CephCluster -o yaml deviceClasses: - name: hdd version: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 version: 16.2.6-0 conditions: - lastHeartbeatTime: "2021-03-02T21:22:11Z" @@ -749,7 +749,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -781,7 +781,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -821,7 +821,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -868,7 +868,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -974,7 +974,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -1020,7 +1020,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: false dashboard: enabled: true @@ -1478,7 +1478,7 @@ spec: enable: true dataDirHostPath: /var/lib/rook cephVersion: - image: quay.io/ceph/ceph:v16.2.6 # Should match external cluster version + image: quay.io/ceph/ceph:v16.2.7 # Should match external cluster version ``` ### Deleting a CephCluster diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index 130b29401747..ea24488efc61 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -458,7 +458,7 @@ Prior to August 2021, official images were on docker.io. While those images will These images are tagged in a few ways: -* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v16.2.6-20210918`). +* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v16.2.7-20211208`). 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., `v16`) are useful for development and test clusters so that the @@ -474,7 +474,7 @@ The majority of the upgrade will be handled by the Rook operator. Begin the upgr Ceph image field in the cluster CRD (`spec.cephVersion.image`). ```sh -NEW_CEPH_IMAGE='quay.io/ceph/ceph:v16.2.6-20210918' +NEW_CEPH_IMAGE='quay.io/ceph/ceph:v16.2.7-20211208' CLUSTER_NAME="$ROOK_CLUSTER_NAMESPACE" # change if your cluster name is not the Rook namespace kubectl -n $ROOK_CLUSTER_NAMESPACE patch CephCluster $CLUSTER_NAME --type=merge -p "{\"spec\": {\"cephVersion\": {\"image\": \"$NEW_CEPH_IMAGE\"}}}" ``` diff --git a/deploy/charts/rook-ceph-cluster/values.yaml b/deploy/charts/rook-ceph-cluster/values.yaml index 91ef523da437..1ca0664ecb4d 100644 --- a/deploy/charts/rook-ceph-cluster/values.yaml +++ b/deploy/charts/rook-ceph-cluster/values.yaml @@ -48,7 +48,7 @@ cephClusterSpec: # 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 quay.io/ceph/ceph:v15.2.11-20200419 # 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:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 # Whether to allow unsupported versions of Ceph. Currently `octopus` and `pacific` are supported. # Future versions such as `pacific` 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 8d50dcfd6492..341ad9effd73 100644 --- a/deploy/examples/cluster-external-management.yaml +++ b/deploy/examples/cluster-external-management.yaml @@ -19,4 +19,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:v16.2.6 # Should match external cluster version + image: quay.io/ceph/ceph:v16.2.7 # Should match external cluster version diff --git a/deploy/examples/cluster-on-local-pvc.yaml b/deploy/examples/cluster-on-local-pvc.yaml index 900030d76eb4..be9879438933 100644 --- a/deploy/examples/cluster-on-local-pvc.yaml +++ b/deploy/examples/cluster-on-local-pvc.yaml @@ -173,7 +173,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-on-pvc.yaml b/deploy/examples/cluster-on-pvc.yaml index 2c612596bff9..388bfe1f4942 100644 --- a/deploy/examples/cluster-on-pvc.yaml +++ b/deploy/examples/cluster-on-pvc.yaml @@ -33,7 +33,7 @@ spec: requests: storage: 10Gi cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-stretched-aws.yaml b/deploy/examples/cluster-stretched-aws.yaml index dd7cf2aae56c..f5884ed065ce 100644 --- a/deploy/examples/cluster-stretched-aws.yaml +++ b/deploy/examples/cluster-stretched-aws.yaml @@ -45,7 +45,7 @@ spec: count: 2 cephVersion: # Stretch cluster support upstream is only available starting in Ceph Pacific - image: quay.io/ceph/ceph:v16.2.2 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: true skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-stretched.yaml b/deploy/examples/cluster-stretched.yaml index dd25805dcf4a..b4f3c58cb2a2 100644 --- a/deploy/examples/cluster-stretched.yaml +++ b/deploy/examples/cluster-stretched.yaml @@ -39,7 +39,7 @@ spec: count: 2 cephVersion: # Stretch cluster support upstream is only available starting in Ceph Pacific - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: true skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/deploy/examples/cluster-test.yaml b/deploy/examples/cluster-test.yaml index 0855f95bddb2..65e79072b19e 100644 --- a/deploy/examples/cluster-test.yaml +++ b/deploy/examples/cluster-test.yaml @@ -28,7 +28,7 @@ metadata: spec: dataDirHostPath: /var/lib/rook cephVersion: - image: quay.io/ceph/ceph:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 allowUnsupported: true mon: count: 1 diff --git a/deploy/examples/cluster.yaml b/deploy/examples/cluster.yaml index 7c28ea92e01a..a65390cdb1f5 100644 --- a/deploy/examples/cluster.yaml +++ b/deploy/examples/cluster.yaml @@ -19,9 +19,9 @@ spec: # v15 is octopus, and v16 is pacific. # RECOMMENDATION: In production, use a specific version tag instead of the general v14 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 quay.io/ceph/ceph:v16.2.6-20210918 + # If you want to be more precise, you can always use a timestamp tag such quay.io/ceph/ceph:v16.2.7-20211208 # 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:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 # Whether to allow unsupported versions of Ceph. Currently `octopus` and `pacific` are supported. # Future versions such as `pacific` 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 6c6199694d1b..969b69e3cbab 100644 --- a/deploy/examples/images.txt +++ b/deploy/examples/images.txt @@ -3,7 +3,7 @@ k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.0 - quay.io/ceph/ceph:v16.2.6 + quay.io/ceph/ceph:v16.2.7 quay.io/cephcsi/cephcsi:v3.4.0 quay.io/csiaddons/volumereplication-operator:v0.1.0 rook/ceph:v1.8.0-beta.0 diff --git a/deploy/olm/assemble/metadata-common.yaml b/deploy/olm/assemble/metadata-common.yaml index 9f4d3a82de83..5faa9a99c5b6 100644 --- a/deploy/olm/assemble/metadata-common.yaml +++ b/deploy/olm/assemble/metadata-common.yaml @@ -240,7 +240,7 @@ metadata: }, "spec": { "cephVersion": { - "image": "quay.io/ceph/ceph:v16.2.6" + "image": "quay.io/ceph/ceph:v16.2.7" }, "dataDirHostPath": "/var/lib/rook", "mon": { diff --git a/design/ceph/ceph-cluster-cleanup.md b/design/ceph/ceph-cluster-cleanup.md index 4cc116dda919..281272bf8fd2 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:v16.2.6 + image: quay.io/ceph/ceph:v16.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 85667571b669..2899ae4e4650 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -18,9 +18,9 @@ include ../image.mk # Image Build Options ifeq ($(GOARCH),amd64) -CEPH_VERSION = v16.2.6-20210918 +CEPH_VERSION = v16.2.7-20211208 else -CEPH_VERSION = v16.2.6-20210918 +CEPH_VERSION = v16.2.7-20211208 endif REGISTRY_NAME = quay.io BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph-$(GOARCH):$(CEPH_VERSION) diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 1112b07a3bd2..68716100524e 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -45,7 +45,7 @@ const ( // test with the latest octopus build octopusTestImage = "quay.io/ceph/ceph:v15" // test with the latest pacific build - pacificTestImage = "quay.io/ceph/ceph:v16.2.6" + pacificTestImage = "quay.io/ceph/ceph:v16" // test with the current development version of Pacific pacificDevelTestImage = "quay.io/ceph/daemon-base:latest-pacific-devel" octopusDevelTestImage = "quay.io/ceph/daemon-base:latest-octopus-devel"