From 3b9ee5f1c0c6eed577c9b370b04302814d745caf Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@hackerspace.pl>
Date: Tue, 19 Jan 2021 22:44:07 +0100
Subject: [PATCH] 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
---
 cluster/kube/k0.libsonnet       | 3 +++
 cluster/kube/lib/rook.libsonnet | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index aeb1d352..50f9d188 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -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,
diff --git a/cluster/kube/lib/rook.libsonnet b/cluster/kube/lib/rook.libsonnet
index 4edfe7dd..c8e38a88 100644
--- a/cluster/kube/lib/rook.libsonnet
+++ b/cluster/kube/lib/rook.libsonnet
@@ -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],