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

Merge pull request #7733 from travisn/ceph-15.2.11

Browse Source 
ceph: Example manifests to deploy with v15.2.11
This commit is contained in:
Travis Nielsen
2021-04-22 12:12:41 -06:00
committed by GitHub
parent e9a5d9f087 43594adbbb
commit 116bf7dcf1
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Documentation/ceph-cluster-crd.md
+10 -10
View File
@@ -32,7 +32,7 @@ metadata:
spec:
cephVersion:
# see the "Cluster Settings" section below for more details on which image of ceph to run
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -59,7 +59,7 @@ metadata:
spec:
cephVersion:
# see the "Cluster Settings" section below for more details on which image of ceph to run
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -168,7 +168,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, `ceph/ceph:v14.2.12` or `ceph/ceph:v15.2.9`. For more details read the [container images section](#ceph-container-images).
* `image`: The image used for running the ceph daemons. For example, `ceph/ceph:v14.2.12` or `ceph/ceph:v15.2.11`. 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 `v14` will be updated each time a new nautilus build is released.
@@ -712,7 +712,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -744,7 +744,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -784,7 +784,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -831,7 +831,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -937,7 +937,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
@@ -983,7 +983,7 @@ spec:
requests:
storage: 10Gi
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
allowUnsupported: false
dashboard:
enabled: true
@@ -1428,7 +1428,7 @@ spec:
enable: true
dataDirHostPath: /var/lib/rook
cephVersion:
image: ceph/ceph:v15.2.9 # Should match external cluster version
image: ceph/ceph:v15.2.11 # Should match external cluster version
```
### Cleanup policy
Documentation/ceph-upgrade.md
+4 -4
View File
@@ -366,9 +366,9 @@ Verify the Ceph cluster's health using the [health verification section](#health
## Ceph Version Upgrades
Rook v1.6 now supports Ceph Pacific 16.2.0 or newer. Support remains for Ceph Nautilus 14.2.5 or
Rook v1.6 now supports Ceph Pacific 16.2.0 or newer. Support remains for Ceph Nautilus 14.2.5 or
newer and Ceph Octopus v15.2.0 or newer. These are the only supported major versions of Ceph. Rook
v1.7 will no longer support Ceph Nautilus (14.2.x), and users will have to upgrade Ceph to
v1.7 will no longer support Ceph Nautilus (14.2.x), and users will have to upgrade Ceph to
Octopus (15.2.x) or Pacific (16.2.x) before the next upgrade.
> **IMPORTANT: When an update is requested, the operator will check Ceph's status, if it is in `HEALTH_ERR` it will refuse to do the upgrade.**
@@ -386,7 +386,7 @@ until all the daemons have been updated.
Official Ceph container images can be found on [Docker Hub](https://hub.docker.com/r/ceph/ceph/tags/).
These images are tagged in a few ways:
* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v15.2.9-20210224`).
* The most explicit form of tags are full-ceph-version-and-build tags (e.g., `v15.2.11-20210224`).
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., `v15`) are useful for development and test clusters so that the
@@ -402,7 +402,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='ceph/ceph:v15.2.9-20210224'
NEW_CEPH_IMAGE='ceph/ceph:v15.2.11-20210224'
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\"}}}"
```
cluster/charts/rook-ceph/templates/resources.yaml
+1 -1
View File
@@ -474,7 +474,7 @@ spec:
description: Whether to allow unsupported versions (do not set to true in production)
type: boolean
image:
description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.9
description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.11
type: string
required:
- image
cluster/examples/kubernetes/ceph/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: ceph/ceph:v15.2.9 # Should match external cluster version
image: ceph/ceph:v15.2.11 # Should match external cluster version
cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml
+1 -1
View File
@@ -33,7 +33,7 @@ spec:
requests:
storage: 10Gi
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
allowUnsupported: false
skipUpgradeChecks: false
continueUpgradeAfterChecksEvenIfNotHealthy: false
cluster/examples/kubernetes/ceph/cluster.yaml
+2 -2
View File
@@ -19,9 +19,9 @@ spec:
# v13 is mimic, v14 is nautilus, and v15 is octopus.
# 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 ceph/ceph:v15.2.9-20201217
# If you want to be more precise, you can always use a timestamp tag such 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: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
# Whether to allow unsupported versions of Ceph. Currently `nautilus` and `octopus` are supported.
# Future versions such as `pacific` would require this to be set to `true`.
# Do not set to true in production.
cluster/examples/kubernetes/ceph/crds.yaml
+1 -1
View File
@@ -476,7 +476,7 @@ spec:
description: Whether to allow unsupported versions (do not set to true in production)
type: boolean
image:
description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.9
description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.11
type: string
required:
- image
cluster/olm/ceph/assemble/metadata-common.yaml
+1 -1
View File
@@ -230,7 +230,7 @@ metadata:
},
"spec": {
"cephVersion": {
"image": "ceph/ceph:v15.2.9"
"image": "ceph/ceph:v15.2.11"
},
"dataDirHostPath": "/var/lib/rook",
"mon": {
design/ceph/ceph-cluster-cleanup.md
+1 -1
View File
@@ -34,7 +34,7 @@ metadata:
namespace: rook-ceph
spec:
cephVersion:
image: ceph/ceph:v15.2.9
image: ceph/ceph:v15.2.11
dataDirHostPath: /var/lib/rook
mon:
count: 3
pkg/apis/ceph.rook.io/v1/types.go
+1 -1
View File
@@ -251,7 +251,7 @@ type KeyManagementServiceSpec struct {
// CephVersionSpec represents the settings for the Ceph version that Rook is orchestrating.
type CephVersionSpec struct {
// Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.9
// Image is the container image used to launch the ceph daemons, such as ceph/ceph:v15.2.11
Image string `json:"image"`
// Whether to allow unsupported versions (do not set to true in production)