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 <tnielsen@redhat.com>
This commit is contained in:
8 files changed
+21
-17
No files matched your search
@@ -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`.
|
||||
|
||||
@@ -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
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -191,7 +191,7 @@ metadata:
|
||||
},
|
||||
"spec": {
|
||||
"cephVersion": {
|
||||
"image": "ceph/ceph:v14.2.6"
|
||||
"image": "ceph/ceph:v14.2.7"
|
||||
},
|
||||
"dataDirHostPath": "/var/lib/rook",
|
||||
"mon": {
|
||||
|
||||
@@ -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
|
||||
fi
|
||||
@@ -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)
|
||||
}
|
||||
Reference in new issue
Block a user