From 5245ceaf06a17f5cea6fe2ca8eb14c7eb53c2078 Mon Sep 17 00:00:00 2001 From: Blaine Gardner Date: Wed, 5 May 2021 11:35:34 -0600 Subject: [PATCH] ceph: update images to v16.2.2 Ceph v16.2.2 is released with dated tag v16.2.2-20210505. Update Ceph images to match with or without date as appropriate. Signed-off-by: Blaine Gardner --- Documentation/ceph-cluster-crd.md | 2 +- cluster/examples/kubernetes/ceph/cluster-stretched.yaml | 2 +- images/ceph/Makefile | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index 03f4f52f2..d35846f28 100755 --- a/Documentation/ceph-cluster-crd.md +++ b/Documentation/ceph-cluster-crd.md @@ -129,7 +129,7 @@ spec: - name: c cephVersion: # Stretch cluster is supported in Ceph Pacific or newer. - image: ceph/ceph:v16.2.1 + image: ceph/ceph:v16.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/cluster/examples/kubernetes/ceph/cluster-stretched.yaml b/cluster/examples/kubernetes/ceph/cluster-stretched.yaml index 3a95a3ff5..bbc7d46d3 100644 --- a/cluster/examples/kubernetes/ceph/cluster-stretched.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-stretched.yaml @@ -39,7 +39,7 @@ spec: count: 2 cephVersion: # Stretch cluster support upstream is only available starting in Ceph Pacific - image: ceph/ceph:v16.2.1 + image: ceph/ceph:v16.2.2 allowUnsupported: true skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 7f33cee19..d07b05f50 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.1-20210419 +CEPH_VERSION = v16.2.2-20210505 else -CEPH_VERSION = v16.2.1-20210419 +CEPH_VERSION = v16.2.2-20210505 endif BASEIMAGE = ceph/ceph-$(GOARCH):$(CEPH_VERSION) CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) @@ -117,4 +117,4 @@ csv: $(OPERATOR_SDK) $(YQ) ## Generate a CSV file for OLM. @cd ../.. && cluster/olm/ceph/generate-rook-csv.sh $(CSV_VERSION) $(CSV_PLATFORM) $(ROOK_OP_VERSION) csv-clean: $(OPERATOR_SDK) $(YQ) ## Remove existing OLM files. - @rm -fr ../../cluster/olm/ceph/deploy/* ../../cluster/olm/ceph/templates/* \ No newline at end of file + @rm -fr ../../cluster/olm/ceph/deploy/* ../../cluster/olm/ceph/templates/*