diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index 58c7ad279..21ca49758 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -91,7 +91,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.3-20190904`. + - `image`: The image used for running the ceph daemons. For example, `ceph/ceph:v13.2.6-20190604` or `ceph/ceph:v14.2.4-20190917`. 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. @@ -319,7 +319,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -351,7 +351,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -394,7 +394,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -431,7 +431,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -477,7 +477,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -515,7 +515,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -579,7 +579,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -626,7 +626,7 @@ spec: requests: storage: 10Gi cephVersion: - image: ceph/ceph:v14.2.3-20190904 + image: ceph/ceph:v14.2.4-20190917 allowUnsupported: false dashboard: enabled: true @@ -712,7 +712,7 @@ spec: enable: true dataDirHostPath: /var/lib/rook cephVersion: - image: ceph/ceph:v14.2.3-20190904 # the image version **must** match the version of the external Ceph cluster + image: ceph/ceph:v14.2.4-20190917 # 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 5511f96e7..82b6b7320 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 dataDirHostPath: /var/lib/rook mon: count: 3 diff --git a/cluster/examples/kubernetes/ceph/cluster-external.yaml b/cluster/examples/kubernetes/ceph/cluster-external.yaml index 85591bbb9..1475a0c20 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.3-20190904 # MUST match external cluster version + image: ceph/ceph:v14.2.4-20190917 # MUST match external cluster version diff --git a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml index a7c819bbf..3d65812db 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 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 335ab07d8..dd07455cf 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 allowUnsupported: false dashboard: enabled: true diff --git a/cluster/examples/kubernetes/ceph/cluster-test.yaml b/cluster/examples/kubernetes/ceph/cluster-test.yaml index 92f34a2d3..6fc643d91 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 allowUnsupported: true dataDirHostPath: /var/lib/rook mon: diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 2982c3704..9a61cea3b 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.3-20190904 + image: ceph/ceph:v14.2.4-20190917 # 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 4a7ceb476..c9b54a275 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.3-20190904" + "image": "ceph/ceph:v14.2.4-20190917" }, "dataDirHostPath": "/var/lib/rook", "mon": { diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 8b43af668..5d1eff0e3 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -17,7 +17,7 @@ include ../image.mk # ==================================================================================== # Image Build Options -CEPH_VERSION = v14.2.3-20190904 +CEPH_VERSION = v14.2.4-20190917 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 17228919b..2fc9f26bd 100644 --- a/pkg/operator/ceph/cluster/controller_test.go +++ b/pkg/operator/ceph/cluster/controller_test.go @@ -202,7 +202,7 @@ func TestValidateExternalClusterSpec(t *testing.T) { err = validateExternalClusterSpec(c) assert.Error(t, err) - c.Spec.CephVersion.Image = "ceph/ceph:v14.2.3-20190904" + c.Spec.CephVersion.Image = "ceph/ceph:v14.2.4-20190917" err = validateExternalClusterSpec(c) assert.NoError(t, err) } diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 7b029cea5..b9d6c3fbb 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.3-20190904" + nautilusTestImage = "ceph/ceph:v14.2.4-20190917" 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 9e31ab944..d057dfa55 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.3-20190904"}) + i := installer.NewCephInstaller(t, kh.Clientset, false, installer.VersionMaster, cephv1.CephVersionSpec{Image: "ceph/ceph:v14.2.4-20190917"}) op := LoadTestCluster{i, kh, nil, t, namespace} op.Setup()