cluster: k0: upgrade to ceph 16.2.5
This was fun. See b/6 for a log of how swimmingly this went.
Change-Id: I96c3c18b5d33ef86523b3506f49a390419e9ca7f
diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index 2249dae..bd3a9f5 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -140,7 +140,6 @@
for id in [
"5000c5008508c433",
"5000c500850989cf",
- "5000c5008508f843",
"5000c5008508baf7",
]
],
@@ -150,7 +149,6 @@
devices: [
{ name: "/dev/disk/by-id/wwn-0x" + id }
for id in [
- "5000c5008508ee03",
"5000c5008508c9ef",
"5000c5008508df33",
"5000c5008508dd3b",
diff --git a/cluster/kube/lib/rook.libsonnet b/cluster/kube/lib/rook.libsonnet
index 0e875d7..6646df5 100644
--- a/cluster/kube/lib/rook.libsonnet
+++ b/cluster/kube/lib/rook.libsonnet
@@ -726,8 +726,7 @@
metadata+: cluster.metadata,
spec: {
cephVersion: {
- # https://github.com/rook/rook/issues/2945#issuecomment-483964014
- image: "ceph/ceph:v14.2.16",
+ image: "quay.io/ceph/ceph:v16.2.5",
allowUnsupported: true,
},
dataDirHostPath: if name == "ceph-waw2" then "/var/lib/rook" else "/var/lib/rook-%s" % [name],