diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index ab230a01b..6559f6ccc 100755 --- a/Documentation/ceph-cluster-crd.md +++ b/Documentation/ceph-cluster-crd.md @@ -31,7 +31,7 @@ metadata: spec: cephVersion: # see the "Cluster Settings" section below for more details on which image of ceph to run - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -90,7 +90,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 this setting is enabled **all** the other options will be ignored except `cephVersion.image` and `dataDirHostPath`. See [external cluster configuration](#external-cluster). - `cephVersion`: The version information for launching the ceph daemons. - - `image`: The image used for running the ceph daemons. For example, `ceph/ceph:v13.2.6-20190604` or `ceph/ceph:v14.2.2-20190722`. + - `image`: The image used for running the ceph daemons. For example, `ceph/ceph:v13.2.6-20190604` or `ceph/ceph:v14.2.2-20190826`. 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. @@ -300,7 +300,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -332,7 +332,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -375,7 +375,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -412,7 +412,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -458,7 +458,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -496,7 +496,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -560,7 +560,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -607,7 +607,7 @@ spec: requests: storage: 10Gi cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 allowUnsupported: false dashboard: enabled: true @@ -692,7 +692,7 @@ spec: enable: true dataDirHostPath: /var/lib/rook cephVersion: - image: ceph/ceph:v14.2.2-20190722 # the image version **must** match the version of the external Ceph cluster + image: ceph/ceph:v14.2.2-20190826 # the image version **must** match the version of the external Ceph cluster ``` Choose the namespace carefully, if you have an existing cluster managed by Rook, you have likely already injected `common.yaml`. diff --git a/Documentation/ceph-quickstart.md b/Documentation/ceph-quickstart.md index 6bdea8227..5f1aea318 100644 --- a/Documentation/ceph-quickstart.md +++ b/Documentation/ceph-quickstart.md @@ -77,7 +77,7 @@ metadata: spec: cephVersion: # For the latest ceph images, see https://hub.docker.com/r/ceph/ceph/tags - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/Documentation/ceph-upgrade.md b/Documentation/ceph-upgrade.md index 6d73dc2c3..5b514fdfe 100644 --- a/Documentation/ceph-upgrade.md +++ b/Documentation/ceph-upgrade.md @@ -301,7 +301,7 @@ These images are tagged in a few ways: The majority of the upgrade will be handled by the Rook operator. Begin the upgrade by changing the Ceph image field in the cluster CRD (`spec:cephVersion:image`). ```sh -NEW_CEPH_IMAGE='ceph/ceph:v14.2.2-20190722' +NEW_CEPH_IMAGE='ceph/ceph:v14.2.2-20190826' CLUSTER_NAME="$ROOK_NAMESPACE" # change if your cluster name is not the Rook namespace kubectl -n $ROOK_NAMESPACE patch CephCluster $CLUSTER_NAME --type=merge \ -p "{\"spec\": {\"cephVersion\": {\"image\": \"$NEW_CEPH_IMAGE\"}}}" @@ -314,9 +314,9 @@ version has fully updated is rather simple. watch kubectl -n $ROOK_NAMESPACE describe pods | grep "Image:.*ceph/ceph" | sort | uniq # This cluster is not yet finished: # Image: ceph/ceph:v13.2.2-20181023 -# Image: ceph/ceph:v14.2.2-20190722 +# Image: ceph/ceph:v14.2.2-20190826 # This cluster is also finished: -# Image: ceph/ceph:v14.2.2-20190722 +# Image: ceph/ceph:v14.2.2-20190826 ``` ### 3. Enable Nautilus features diff --git a/cluster/examples/kubernetes/ceph/cluster-external.yaml b/cluster/examples/kubernetes/ceph/cluster-external.yaml index 72df038f9..33496682c 100644 --- a/cluster/examples/kubernetes/ceph/cluster-external.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-external.yaml @@ -20,4 +20,4 @@ spec: enable: true dataDirHostPath: /var/lib/rook cephVersion: - image: ceph/ceph:v14.2.2-20190722 # MUST match external cluster version + image: ceph/ceph:v14.2.2-20190826 # MUST match external cluster version diff --git a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml index c37e19e5a..63452548c 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:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 allowUnsupported: false dataDirHostPath: /var/lib/rook mon: diff --git a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml index ca97eb78b..edd324871 100644 --- a/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-on-pvc.yaml @@ -32,7 +32,7 @@ spec: requests: storage: 10Gi cephVersion: - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 allowUnsupported: false dashboard: enabled: true diff --git a/cluster/examples/kubernetes/ceph/cluster-test.yaml b/cluster/examples/kubernetes/ceph/cluster-test.yaml index e6e00a341..0234a727e 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:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 allowUnsupported: true dataDirHostPath: /var/lib/rook mon: diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index e25c8d3e0..06085dc6c 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -20,7 +20,7 @@ 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/. - image: ceph/ceph:v14.2.2-20190722 + image: ceph/ceph:v14.2.2-20190826 # Whether to allow unsupported versions of Ceph. Currently mimic and nautilus are supported, with the recommendation to upgrade to nautilus. # Octopus is the version allowed when this is set to true. # Do not set to true in production. diff --git a/cluster/olm/ceph/assemble/metadata-common.yaml b/cluster/olm/ceph/assemble/metadata-common.yaml index b18db39d8..02d45b216 100644 --- a/cluster/olm/ceph/assemble/metadata-common.yaml +++ b/cluster/olm/ceph/assemble/metadata-common.yaml @@ -89,7 +89,7 @@ metadata: }, "spec": { "cephVersion": { - "image": "ceph/ceph:v14.2.2-20190722" + "image": "ceph/ceph:v14.2.2-20190826" }, "dataDirHostPath": "/var/lib/rook", "mon": { diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 3869a0e77..7e3f31746 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -17,7 +17,7 @@ include ../image.mk # ==================================================================================== # Image Build Options -CEPH_VERSION = v14.2.2-20190722 +CEPH_VERSION = v14.2.2-20190826 BASEIMAGE = ceph/ceph-$(GOARCH):$(CEPH_VERSION) CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) OPERATOR_SDK_VERSION = v0.10.0 diff --git a/pkg/operator/ceph/cluster/controller_test.go b/pkg/operator/ceph/cluster/controller_test.go index dbab1ba33..fde8d453e 100644 --- a/pkg/operator/ceph/cluster/controller_test.go +++ b/pkg/operator/ceph/cluster/controller_test.go @@ -196,7 +196,7 @@ func TestValidateExternalClusterSpec(t *testing.T) { err = validateExternalClusterSpec(c) assert.Error(t, err) - c.Spec.CephVersion.Image = "ceph/ceph:v14.2.2-20190722" + c.Spec.CephVersion.Image = "ceph/ceph:v14.2.2-20190826" err = validateExternalClusterSpec(c) assert.NoError(t, err) } diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index aea939a6d..a63c26212 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -41,7 +41,7 @@ const ( // test with the latest mimic build mimicTestImage = "ceph/ceph:v13" // test with the latest nautilus build - nautilusTestImage = "ceph/ceph:v14.2.2-20190722" + nautilusTestImage = "ceph/ceph:v14.2.2-20190826" helmChartName = "local/rook-ceph" helmDeployName = "rook-ceph" cephOperatorLabel = "app=rook-ceph-operator" diff --git a/tests/longhaul/base_block_test.go b/tests/longhaul/base_block_test.go index 60d6ac979..260aa376f 100644 --- a/tests/longhaul/base_block_test.go +++ b/tests/longhaul/base_block_test.go @@ -145,7 +145,7 @@ func StartLoadTestCluster(t func() *testing.T, namespace string) (LoadTestCluste kh, err := utils.CreateK8sHelper(t) require.NoError(t(), err) - i := installer.NewCephInstaller(t, kh.Clientset, false, installer.VersionMaster, cephv1.CephVersionSpec{Image: "ceph/ceph:v14.2.2-20190722"}) + i := installer.NewCephInstaller(t, kh.Clientset, false, installer.VersionMaster, cephv1.CephVersionSpec{Image: "ceph/ceph:v14.2.2-20190826"}) op := LoadTestCluster{i, kh, nil, t, namespace} op.Setup()