From e35939b26c40f0ec44e0dce72ca61875ebfd1d03 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Thu, 20 Feb 2020 11:06:40 -0700 Subject: [PATCH] ceph: bump ceph version to v14.2.7 The ceph/ceph:v14.2.7 image is released so we can pick these fixes up as the recommended version of ceph. Signed-off-by: Travis Nielsen --- Documentation/ceph-cluster-crd.md | 18 +++++++++--------- .../kubernetes/ceph/cluster-external.yaml | 2 +- .../kubernetes/ceph/cluster-minimal.yaml | 2 +- .../kubernetes/ceph/cluster-on-pvc.yaml | 2 +- cluster/examples/kubernetes/ceph/cluster.yaml | 2 +- cluster/olm/ceph/assemble/metadata-common.yaml | 2 +- images/ceph/Makefile | 8 ++++++-- pkg/operator/ceph/cluster/controller_test.go | 2 +- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Documentation/ceph-cluster-crd.md b/Documentation/ceph-cluster-crd.md index faeb428eb..5221a3c27 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.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -54,7 +54,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.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -394,7 +394,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -426,7 +426,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -466,7 +466,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -513,7 +513,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -611,7 +611,7 @@ metadata: namespace: rook-ceph spec: cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 dataDirHostPath: /var/lib/rook mon: count: 3 @@ -657,7 +657,7 @@ spec: requests: storage: 10Gi cephVersion: - image: ceph/ceph:v14.2.6 + image: ceph/ceph:v14.2.7 allowUnsupported: false dashboard: enabled: true @@ -815,7 +815,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.6 # MUST match external cluster version + image: ceph/ceph:v14.2.7 # 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/cluster/examples/kubernetes/ceph/cluster-external.yaml b/cluster/examples/kubernetes/ceph/cluster-external.yaml index 1285bf790..c928e1938 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.6 # MUST match external cluster version + image: ceph/ceph:v14.2.7 # Should match external cluster version diff --git a/cluster/examples/kubernetes/ceph/cluster-minimal.yaml b/cluster/examples/kubernetes/ceph/cluster-minimal.yaml index 949bb6794..3ed51bde0 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.6 + image: ceph/ceph:v14.2.7 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 d481a019e..6c9f3ad3b 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.6 + image: ceph/ceph:v14.2.7 allowUnsupported: false skipUpgradeChecks: false continueUpgradeAfterChecksEvenIfNotHealthy: false diff --git a/cluster/examples/kubernetes/ceph/cluster.yaml b/cluster/examples/kubernetes/ceph/cluster.yaml index a427c1827..e41af7413 100644 --- a/cluster/examples/kubernetes/ceph/cluster.yaml +++ b/cluster/examples/kubernetes/ceph/cluster.yaml @@ -22,7 +22,7 @@ spec: # 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: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.6 + image: ceph/ceph:v14.2.7 # 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 7a2952229..ffffac1df 100644 --- a/cluster/olm/ceph/assemble/metadata-common.yaml +++ b/cluster/olm/ceph/assemble/metadata-common.yaml @@ -191,7 +191,7 @@ metadata: }, "spec": { "cephVersion": { - "image": "ceph/ceph:v14.2.6" + "image": "ceph/ceph:v14.2.7" }, "dataDirHostPath": "/var/lib/rook", "mon": { diff --git a/images/ceph/Makefile b/images/ceph/Makefile index 09ddd12c8..39e7c2bad 100755 --- a/images/ceph/Makefile +++ b/images/ceph/Makefile @@ -17,7 +17,11 @@ include ../image.mk # ==================================================================================== # Image Build Options -CEPH_VERSION = v14.2.6-20200115 +ifeq ($(GOARCH),amd64) +CEPH_VERSION = v14.2.7-20200201 +else +CEPH_VERSION = v14.2.7-20200206 +endif BASEIMAGE = ceph/ceph-$(GOARCH):$(CEPH_VERSION) CEPH_IMAGE = $(BUILD_REGISTRY)/ceph-$(GOARCH) OPERATOR_SDK_VERSION = v0.10.0 @@ -73,4 +77,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 \ No newline at end of file + fi diff --git a/pkg/operator/ceph/cluster/controller_test.go b/pkg/operator/ceph/cluster/controller_test.go index 94fc17127..d19dbacec 100644 --- a/pkg/operator/ceph/cluster/controller_test.go +++ b/pkg/operator/ceph/cluster/controller_test.go @@ -261,7 +261,7 @@ func TestValidateExternalClusterSpec(t *testing.T) { err = validateExternalClusterSpec(c) assert.NoError(t, err, err) - c.Spec.CephVersion.Image = "ceph/ceph:v14.2.6" + c.Spec.CephVersion.Image = "ceph/ceph:v14.2.7" err = validateExternalClusterSpec(c) assert.NoError(t, err) }