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
diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index aeb1d35..50f9d18 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -88,6 +88,9 @@
// 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,
diff --git a/cluster/kube/lib/rook.libsonnet b/cluster/kube/lib/rook.libsonnet
index 4edfe7d..c8e38a8 100644
--- a/cluster/kube/lib/rook.libsonnet
+++ b/cluster/kube/lib/rook.libsonnet
@@ -54,6 +54,7 @@
},
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 @@
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],