ceph: bump to 14.2.16

More as-builts. This has already been bumped. Had to coax ceph-waw2 to
upgrade despite the fact that it's horribly broken.

Change-Id: Ia762f5d7d88d6420c2fc25cf199037cbccde0cb3
This commit is contained in:
q3k 2021-01-19 22:44:07 +01:00 committed by q3k
parent 2c04c8410a
commit 3b9ee5f1c0
2 changed files with 5 additions and 2 deletions

View file

@ -88,6 +88,9 @@ local rook = import "lib/rook.libsonnet";
// waw2 cluster: shitty 7200RPM 2.5" HDDs
waw2: rook.Cluster(k0.cluster.rook, "ceph-waw2") {
spec: {
// This cluster is quite broken. We're just keeping it around
// for the hell of it.
continueUpgradeAfterChecksEvenIfNotHealthy: true,
mon: {
count: 3,
allowMultiplePerNode: false,

View file

@ -54,6 +54,7 @@ local oa = kube.OpenAPI;
},
dataDirHostPath: oa.String { pattern: "^/(\\S+)" },
skipUpgradeChecks: oa.Boolean,
continueUpgradeAfterChecksEvenIfNotHealthy: oa.Boolean,
mon: oa.Dict {
allowMultiplePerNode: oa.Boolean,
count: oa.Integer { minimum: 0, maximum: 9 },
@ -850,8 +851,7 @@ local oa = kube.OpenAPI;
spec: {
cephVersion: {
# https://github.com/rook/rook/issues/2945#issuecomment-483964014
#image: "ceph/ceph:v13.2.5-20190319",
image: "ceph/ceph:v14.2.2-20190830",
image: "ceph/ceph:v14.2.16",
allowUnsupported: true,
},
dataDirHostPath: if name == "ceph-waw2" then "/var/lib/rook" else "/var/lib/rook-%s" % [name],