feedc0de/my-rook-config
1
0 Fork 0
forked from rook/rook
Code Pull Requests Activity

Merge pull request #14494 from rook/mergify/bp/release-1.14/pr-14491

Browse Source 
manifest: Update the ceph recommended version to v18.2.4 (backport #14491)
This commit is contained in:
Travis Nielsen authored and GitHub committed 2024-07-24 14:22:33 -06:00
2 parents 2a6d0a9fe3 77969d4aa0
commit b68f4fc759
19 files changed
+46 -48
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Documentation/CRDs/Cluster/ceph-cluster-crd.md
+6 -6
View File
@@ -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:v18.2.2`. 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:v18.2.4`. 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 `v17` will be updated each time a new Quincy build is released.
@@ -114,8 +114,8 @@ These are general purpose Ceph container with all necessary daemons and dependen
| -------------------- | --------------------------------------------------------- |
| vRELNUM | Latest release in this series (e.g., **v17** = Quincy) |
| vRELNUM.Y | Latest stable release in this stable series (e.g., v17.2) |
| vRELNUM.Y.Z | A specific release (e.g., v18.2.2) |
| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v18.2.2-20240311) |
| vRELNUM.Y.Z | A specific release (e.g., v18.2.4) |
| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v18.2.4-20240724) |
A specific will contain a specific release of Ceph as well as security fixes from the Operating System.
@@ -419,7 +419,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -525,7 +525,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -653,7 +653,7 @@ kubectl -n rook-ceph get CephCluster -o yaml
deviceClasses:
- name: hdd
version:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
version: 16.2.6-0
conditions:
- lastHeartbeatTime: "2021-03-02T21:22:11Z"
Documentation/CRDs/Cluster/host-cluster.md
+3 -3
View File
@@ -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:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -49,7 +49,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -101,7 +101,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
Documentation/CRDs/Cluster/pvc-cluster.md
+3 -3
View File
@@ -18,7 +18,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -72,7 +72,7 @@ spec:
requests:
storage: 10Gi
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: false
dashboard:
enabled: true
@@ -128,7 +128,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
Documentation/CRDs/Cluster/stretch-cluster.md
+1 -1
View File
@@ -34,7 +34,7 @@ spec:
- name: b
- name: c
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: true
# Either storageClassDeviceSets or the storage section can be specified for creating OSDs.
# This example uses all devices for simplicity.
Documentation/Upgrade/ceph-upgrade.md
+5 -5
View File
@@ -50,7 +50,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., `v18.2.2-20240311`).
* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v18.2.4-20240724`).
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., `v18`) are useful for development and test clusters so that the
@@ -67,7 +67,7 @@ CephCluster CRD (`spec.cephVersion.image`).
```console
ROOK_CLUSTER_NAMESPACE=rook-ceph
NEW_CEPH_IMAGE='quay.io/ceph/ceph:v18.2.2-20240311'
NEW_CEPH_IMAGE='quay.io/ceph/ceph:v18.2.4-20240724'
kubectl -n $ROOK_CLUSTER_NAMESPACE patch CephCluster $ROOK_CLUSTER_NAMESPACE --type=merge -p "{\"spec\": {\"cephVersion\": {\"image\": \"$NEW_CEPH_IMAGE\"}}}"
```
@@ -79,7 +79,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:v18.2.2-20240311
kubectl -n rook-ceph set image deploy/rook-ceph-tools rook-ceph-tools=quay.io/ceph/ceph:v18.2.4-20240724
```
#### **3. Wait for the pod updates**
@@ -97,9 +97,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=v17.2.7-0
ceph-version=v18.2.2-0
ceph-version=v18.2.4-0
This cluster is finished:
ceph-version=v18.2.2-0
ceph-version=v18.2.4-0
```
#### **4. Verify cluster health**
deploy/charts/rook-ceph-cluster/values.yaml
+9 -9
View File
@@ -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:v18.2.2
image: #quay.io/ceph/ceph:v18.2.4
# -- Toolbox tolerations
tolerations: []
# -- Toolbox affinity
@@ -92,9 +92,9 @@ cephClusterSpec:
# v17 is Quincy, v18 is Reef.
# 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:v18.2.2-20240311
# If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v18.2.4-20240724
# 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:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
# Whether to allow unsupported versions of Ceph. Currently `quincy`, and `reef` are supported.
# Future versions such as `squid` (v19) would require this to be set to `true`.
# Do not set to true in production.
@@ -452,8 +452,8 @@ cephBlockPools:
storageClass:
enabled: true
name: ceph-block
annotations: { }
labels: { }
annotations: {}
labels: {}
isDefault: true
reclaimPolicy: Delete
allowVolumeExpansion: true
@@ -536,8 +536,8 @@ cephFileSystems:
reclaimPolicy: Delete
allowVolumeExpansion: true
volumeBindingMode: "Immediate"
annotations: { }
labels: { }
annotations: {}
labels: {}
mountOptions: []
# see https://github.com/rook/rook/blob/master/Documentation/Storage-Configuration/Shared-Filesystem-CephFS/filesystem-storage.md#provision-storage for available configuration
parameters:
@@ -610,8 +610,8 @@ cephObjectStores:
name: ceph-bucket
reclaimPolicy: Delete
volumeBindingMode: "Immediate"
annotations: { }
labels: { }
annotations: {}
labels: {}
# see https://github.com/rook/rook/blob/master/Documentation/Storage-Configuration/Object-Storage-RGW/ceph-object-bucket-claim.md#storageclass for available configuration
parameters:
# note: objectStoreNamespace and objectStoreName are configured by the chart
deploy/examples/cluster-external-management.yaml
+1 -1
View File
@@ -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:v18.2.2 # Should match external cluster version
image: quay.io/ceph/ceph:v18.2.4 # Should match external cluster version
deploy/examples/cluster-on-local-pvc.yaml
+1 -1
View File
@@ -173,7 +173,7 @@ spec:
requests:
storage: 10Gi
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: false
skipUpgradeChecks: false
continueUpgradeAfterChecksEvenIfNotHealthy: false
deploy/examples/cluster-on-pvc.yaml
+1 -1
View File
@@ -33,7 +33,7 @@ spec:
requests:
storage: 10Gi
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: false
skipUpgradeChecks: false
continueUpgradeAfterChecksEvenIfNotHealthy: false
deploy/examples/cluster-stretched-aws.yaml
+1 -1
View File
@@ -44,7 +44,7 @@ spec:
mgr:
count: 2
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: true
skipUpgradeChecks: false
continueUpgradeAfterChecksEvenIfNotHealthy: false
deploy/examples/cluster-stretched.yaml
+1 -1
View File
@@ -38,7 +38,7 @@ spec:
mgr:
count: 2
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
allowUnsupported: true
skipUpgradeChecks: false
continueUpgradeAfterChecksEvenIfNotHealthy: false
deploy/examples/cluster.yaml
+2 -2
View File
@@ -19,9 +19,9 @@ spec:
# v17 is Quincy, v18 is Reef.
# RECOMMENDATION: In production, use a specific version tag instead of the general v17 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:v18.2.2-20240311
# If you want to be more precise, you can always use a timestamp tag such as quay.io/ceph/ceph:v18.2.4-20240724
# 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:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
# Whether to allow unsupported versions of Ceph. Currently `quincy` and `reef` are supported.
# Future versions such as `squid` (v19) would require this to be set to `true`.
# Do not set to true in production.
deploy/examples/images.txt
+1 -1
View File
@@ -1,5 +1,5 @@
gcr.io/k8s-staging-sig-storage/objectstorage-sidecar/objectstorage-sidecar:v20230130-v0.1.0-24-gc0cf995
quay.io/ceph/ceph:v18.2.2
quay.io/ceph/ceph:v18.2.4
quay.io/ceph/cosi:v0.1.1
quay.io/cephcsi/cephcsi:v3.11.0
quay.io/csiaddons/k8s-sidecar:v0.8.0
deploy/examples/toolbox.yaml
+1 -1
View File
@@ -19,7 +19,7 @@ spec:
serviceAccountName: rook-ceph-default
containers:
- name: rook-ceph-tools
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
command:
- /bin/bash
- -c
design/ceph/ceph-cluster-cleanup.md
+1 -1
View File
@@ -34,7 +34,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dataDirHostPath: /var/lib/rook
mon:
count: 3
images/ceph/Dockerfile
+4 -6
View File
@@ -19,12 +19,10 @@ FROM BASEIMAGE
ARG S5CMD_VERSION
ARG S5CMD_ARCH
# 'ip' tool must be installed for Multus. It's present in the base image today, but it will likely
# be removed in the future. Doing a 'dnf install' sometimes breaks CI when centos repos go down or
# have other package build errors. In order to make sure Rook CI catches the eventual removal and
# also limit Rook CI breakage due to centos breakage, simply check that 'ip' is present.
# Eventually: dnf install -y --repo baseos --setopt=install_weak_deps=False iproute && dnf clean all
RUN which ip
# 'ip' tool must be installed for Multus.
# Doing a 'dnf install' sometimes breaks CI when centos repos go down or have other package build errors.
RUN dnf install -y --repo baseos --setopt=install_weak_deps=False iproute && dnf clean all
# Install the s5cmd package to interact with s3 gateway
RUN curl --fail -sSL -o /s5cmd.tar.gz https://github.com/peak/s5cmd/releases/download/v${S5CMD_VERSION}/s5cmd_${S5CMD_VERSION}_${S5CMD_ARCH}.tar.gz && \
images/ceph/Makefile
+2 -2
View File
@@ -18,9 +18,9 @@ include ../image.mk
# Image Build Options
ifeq ($(GOARCH),amd64)
CEPH_VERSION ?= v18.2.2-20240311
CEPH_VERSION ?= v18.2.4-20240723
else
CEPH_VERSION ?= v18.2.2-20240311
CEPH_VERSION ?= v18.2.4-20240724
endif
REGISTRY_NAME = quay.io
BASEIMAGE = $(REGISTRY_NAME)/ceph/ceph-$(GOARCH):$(CEPH_VERSION)
pkg/operator/ceph/cluster/osd/deviceset_test.go
+2 -2
View File
@@ -294,8 +294,8 @@ func TestPVCName(t *testing.T) {
}
func TestCreateValidImageVersionLabel(t *testing.T) {
image := "ceph/ceph:v18.2.2"
assert.Equal(t, "ceph_ceph_v18.2.2", createValidImageVersionLabel(image))
image := "ceph/ceph:v18.2.4"
assert.Equal(t, "ceph_ceph_v18.2.4", createValidImageVersionLabel(image))
image = "rook/ceph:master"
assert.Equal(t, "rook_ceph_master", createValidImageVersionLabel(image))
image = ".invalid_label"
tests/manifests/test-cluster-on-pvc-encrypted.yaml
+1 -1
View File
@@ -14,7 +14,7 @@ spec:
requests:
storage: 5Gi
cephVersion:
image: quay.io/ceph/ceph:v18.2.2
image: quay.io/ceph/ceph:v18.2.4
dashboard:
enabled: false
network: