From 876de3b999c7d2e9c60ff8073afb7ed42b14eaaa Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 23 Sep 2021 15:11:34 -0600 Subject: [PATCH] ceph: pick up latest ceph base image 16.2.6-20210918 The previous base image in use by rook v16.2.6-20210916 disappeared from quay.io. Signed-off-by: Travis Nielsen (cherry picked from commit fb74e7b2d5d80c1247e5bdcd843a891c3bede0a3) --- Documentation/ceph-upgrade.md | 4 ++-- cluster/examples/kubernetes/ceph/cluster.yaml | 2 +- images/ceph/Makefile | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index d5023cf089de..16599f5b85ac 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -430,7 +430,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-20210916`). +* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v16.2.6-20210918`). 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 @@ -446,7 +446,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-20210916' +NEW_CEPH_IMAGE='quay.io/ceph/ceph:v16.2.6-20210918' 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/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 3f40ff646d5d..4ac6457d121d 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -19,7 +19,7 @@ spec: # v14 is nautilus, 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-20210916 + # If you want to be more precise, you can always use a timestamp tag such quay.io/ceph/ceph:v16.2.6-20210918 # 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 # Whether to allow unsupported versions of Ceph. Currently `nautilus`, `octopus`, and `pacific` are supported. diff --git a/images/ceph/Makefile b/images/ceph/Makefile index ebb73a8ba68e..b1545a19da28 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-20210916 +CEPH_VERSION = v16.2.6-20210918 else -CEPH_VERSION = v16.2.6-20210916 +CEPH_VERSION = v16.2.6-20210918 endif REGISTRY_NAME = quay.io BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph-$(GOARCH):$(CEPH_VERSION)