From 0cf15251fda6574fa455d3f32e248ee4d383d0f6 Mon Sep 17 00:00:00 2001 From: travisn Date: Mon, 22 Apr 2019 17:03:00 -0600 Subject: [PATCH] ceph: set nautilus as the default version to deploy Signed-off-by: travisn --- Documentation/ceph-cluster-crd.md | 14 +++++++------- Documentation/ceph-quickstart.md | 2 +- PendingReleaseNotes.md | 2 +- .../examples/kubernetes/ceph/cluster-minimal.yaml | 2 +- cluster/examples/kubernetes/ceph/cluster-test.yaml | 2 +- cluster/examples/kubernetes/ceph/cluster.yaml | 7 +++---- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index fbb47850c..8a9613f7b 100755 --- a/Documentation/ceph-cluster-crd.md +++ b/Documentation/ceph-cluster-crd.md @@ -23,7 +23,7 @@ metadata: spec: cephVersion: # see the "Cluster Settings" section below for more details on which image of ceph to run - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -222,7 +222,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -254,7 +254,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -297,7 +297,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -334,7 +334,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -380,7 +380,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -418,7 +418,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.2-20181023 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/Documentation/ceph-quickstart.md b/Documentation/ceph-quickstart.md index 7c44c85bc..7e9492085 100644 --- a/Documentation/ceph-quickstart.md +++ b/Documentation/ceph-quickstart.md @@ -70,7 +70,7 @@ metadata: spec: cephVersion: # For the latest ceph images, see https://hub.docker.com/r/ceph/ceph/tags - image: ceph/ceph:v13.2.5-20190319 + image: ceph/ceph:v14.2.0-20190410 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/PendingReleaseNotes.md b/PendingReleaseNotes.md index 23cdc697f..9f1805c7d 100644 --- a/PendingReleaseNotes.md +++ b/PendingReleaseNotes.md @@ -12,7 +12,7 @@ ### Ceph -- Ceph Nautilus (`v14`) is now supported by Rook. +- Ceph Nautilus (`v14`) is now supported by Rook and is the default version deployed by the examples. - Ceph status is surfaced in the CephCluster CR and periodically updated by the operator (default is 60s). The interval can be configured with the `ROOK_CEPH_STATUS_CHECK_INTERVAL` env var. - A `CephNFS` CRD will start NFS daemon(s) for exporting CephFS volumes or RGW buckets. See the [NFS documentation](Documentation/ceph-nfs-crd.md). - Selinux labeling for mounts can now be toggled with the [ROOK_ENABLE_SELINUX_RELABELING](https://github.com/rook/rook/issues/2417) environment variable. diff --git a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml index fc576f4be..83fe60957 100644 --- a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml @@ -16,7 +16,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.5-20190319 + image: ceph/ceph:v14.2.0-20190410 allowUnsupported: false dataDirHostPath: /var/lib/rook mon: diff --git a/cluster/examples/kubernetes/ceph/cluster-test.yaml b/cluster/examples/kubernetes/ceph/cluster-test.yaml index f58c06e1b..a2bed9435 100644 --- a/cluster/examples/kubernetes/ceph/cluster-test.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-test.yaml @@ -14,7 +14,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v13.2.5-20190319 + image: ceph/ceph:v14.2.0-20190410 allowUnsupported: true dataDirHostPath: /var/lib/rook mon: diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 4efbb5daa..544d8e131 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -18,11 +18,10 @@ spec: cephVersion: # The container image used to launch the Ceph daemon pods (mon, mgr, osd, mds, rgw). # v12 is luminous, v13 is mimic, and v14 is nautilus. - # RECOMMENDATION: In production, use a specific version tag instead of the general v13 flag, which pulls the latest release and could result in different + # 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/. - image: ceph/ceph:v13.2.5-20190319 - # Whether to allow unsupported versions of Ceph. Currently only luminous and mimic are supported. - # After nautilus is released, Rook will be updated to support nautilus. + image: ceph/ceph:v14.2.0-20190410 + # Whether to allow unsupported versions of Ceph. Currently luminous, mimic and nautilus are supported, with the recommendation to upgrade to nautilus. # Do not set to true in production. allowUnsupported: false # The path on the host where configuration files will be persisted. Must be specified.