diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index 0e4f86ee6..e26e8a5f3 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.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -94,7 +94,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:v13.2.6-20190604` or `ceph/ceph:v14.2.4-20190917`. + * `image`: The image used for running the ceph daemons. For example, `ceph/ceph:v13.2.6-20190604` or `ceph/ceph:v14.2.5`. 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. @@ -139,6 +139,22 @@ For more details on the mons and when to choose a number other than `3`, see the * `machineDisruptionBudgetNamespace`: the namespace in which to watch the MachineDisruptionBudgets. * `removeOSDsIfOutAndSafeToRemove`: If `true` the operator will remove the OSDs that are down and whose data has been restored to other OSDs. In Ceph terms, the osds are `out` and `safe-to-destroy` when then would be removed. +### Ceph container images + +Official releases of Ceph Container images are available from [Docker Hub](https://hub.docker.com/r/ceph +). + +These are general purpose Ceph container with all necessary daemons and dependencies installed. + +| TAG | MEANING | +|----------------------|-----------------------------------------------------------| +| vRELNUM | Latest release in this series (e.g., *v14* = Nautilus) | +| vRELNUM.Y | Latest stable release in this stable series (e.g., v14.2) | +| vRELNUM.Y.Z | A specific release (e.g., v14.2.5) | +| vRELNUM.Y.Z-YYYYMMDD | A specific build (e.g., v14.2.5-20191203) | + +A specific will contain a specific release of Ceph as well as security fixes from the Operating System. + ### Mon Settings * `count`: Set the number of mons to be started. The number should be odd and between `1` and `9`. If not specified the default is set to `3` and `allowMultiplePerNode` is also set to `true`. @@ -364,7 +380,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -396,7 +412,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -439,7 +455,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -477,7 +493,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -524,7 +540,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -620,7 +636,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -666,7 +682,7 @@ spec: requests: storage: 10Gi cephVersion: - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 allowUnsupported: false dashboard: enabled: true @@ -765,7 +781,7 @@ spec: dataDirHostPath: /var/lib/rook # providing an image is optional, do this if you want to create other CRs (rgw, mds, nfs) cephVersion: - image: ceph/ceph:v14.2.4-20190917 # MUST match external cluster version + image: ceph/ceph:v14.2.5 # MUST match external cluster version ``` 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 43bbaf910..f7a3c47f0 100644 --- a/Documentation/ceph-quickstart.md +++ b/Documentation/ceph-quickstart.md @@ -78,7 +78,7 @@ metadata: spec: cephVersion: # For the latest ceph images, see https://hub.docker.com/r/ceph/ceph/tags - image: ceph/ceph:v14.2.4-20190917 + image: ceph/ceph:v14.2.5 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 791e1e775..8ab1ffbce 100644 --- a/cluster/examples/kubernetes/ceph/cluster-external.yaml +++ b/cluster/examples/kubernetes/ceph/cluster-external.yaml @@ -21,4 +21,4 @@ spec: dataDirHostPath: /var/lib/rook # providing an image is optional, do this if you want to create other CRs (rgw, mds, nfs) cephVersion: - image: ceph/ceph:v14.2.4-20190917 # MUST match external cluster version + image: ceph/ceph:v14.2.5 # MUST match external cluster version diff --git a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml index 5d647466f..d58af99a6 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.4-20190917 + image: ceph/ceph:v14.2.5 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 15faad1d2..0a12069bc 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.4-20190917 + image: ceph/ceph:v14.2.5 allowUnsupported: false dashboard: enabled: true diff --git a/cluster/examples/kubernetes/ceph/cluster-test.yaml b/cluster/examples/kubernetes/ceph/cluster-test.yaml index 27e752b0c..5c6565d17 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.4-20190917 + image: ceph/ceph:v14.2.5 allowUnsupported: true dataDirHostPath: /var/lib/rook skipUpgradeChecks: false diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index 9675da7b2..460277c60 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -20,7 +20,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/. - image: ceph/ceph:v14.2.4-20190917 + # If you want to be more precise, you can always use a timestamp tag such ceph/ceph:v14.2.5-20190917 + # This tag might not contain a new Ceph version, just security fixes from the underlying operating system, which will reduce vulnerabilities + image: ceph/ceph:v14.2.5 # 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 f956a6743..ec7ae3747 100644 --- a/cluster/olm/ceph/assemble/metadata-common.yaml +++ b/cluster/olm/ceph/assemble/metadata-common.yaml @@ -95,7 +95,7 @@ metadata: }, "spec": { "cephVersion": { - "image": "ceph/ceph:v14.2.4-20190917" + "image": "ceph/ceph:v14.2.5" }, "dataDirHostPath": "/var/lib/rook", "mon": { diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 253680294..b5048ea71 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -17,7 +17,7 @@ include ../image.mk # ==================================================================================== # Image Build Options -CEPH_VERSION = v14.2.4-20190917 +CEPH_VERSION = v14.2.5-20191210 BASEIMAGE = ceph/ceph-$(GOARCH):$(CEPH_VERSION) CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) OPERATOR_SDK_VERSION = v0.10.0 @@ -73,4 +73,4 @@ $(OPERATOR_SDK): @if [ ! "$(INCLUDE_CSV_TEMPLATES)" = "" ]; then\ curl -JL https://github.com/operator-framework/operator-sdk/releases/download/$(OPERATOR_SDK_VERSION)/operator-sdk-$(OPERATOR_SDK_VERSION)-$(OPERATOR_SDK_PLATFORM) -o $(TOOLS_HOST_DIR)/operator-sdk-$(OPERATOR_SDK_VERSION);\ chmod +x $(OPERATOR_SDK);\ - fi + fi \ No newline at end of file diff --git a/pkg/operator/ceph/cluster/controller_test.go b/pkg/operator/ceph/cluster/controller_test.go index 33e7d8c95..72db171e8 100644 --- a/pkg/operator/ceph/cluster/controller_test.go +++ b/pkg/operator/ceph/cluster/controller_test.go @@ -263,7 +263,7 @@ func TestValidateExternalClusterSpec(t *testing.T) { err = validateExternalClusterSpec(c) assert.NoError(t, err, err) - c.Spec.CephVersion.Image = "ceph/ceph:v14.2.4-20190917" + c.Spec.CephVersion.Image = "ceph/ceph:v14.2.5" err = validateExternalClusterSpec(c) assert.NoError(t, err) } diff --git a/tests/framework/installer/ceph_installer.go b/tests/framework/installer/ceph_installer.go index 8d96413a2..38fc4922a 100644 --- a/tests/framework/installer/ceph_installer.go +++ b/tests/framework/installer/ceph_installer.go @@ -43,7 +43,7 @@ const ( // test with the latest mimic build mimicTestImage = "ceph/ceph:v13" // test with the latest nautilus build - nautilusTestImage = "ceph/ceph:v14.2.4-20190917" + nautilusTestImage = "ceph/ceph:v14.2.5" 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 d057dfa55..f35cc061e 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.4-20190917"}) + i := installer.NewCephInstaller(t, kh.Clientset, false, installer.VersionMaster, cephv1.CephVersionSpec{Image: "ceph/ceph:v14.2.5"}) op := LoadTestCluster{i, kh, nil, t, namespace} op.Setup()