From 4f0468fa26b696d6b37b2b0f16e93aa4ef4754fe Mon Sep 17 00:00:00 2001
From: Serge Bazanski <q3k@hackerspace.pl>
Date: Sat, 11 Sep 2021 12:22:53 +0000
Subject: [PATCH] cluster/kube: remove ceph diff against k0 production

This now has a zero diff against prod.

location fields in CephCluster.storage.nodes seem to have been removed
from the CRD at some point. Not sure how the CRUSH tree now gets
populated, but whatever, it's been working like this for a while
already. Same for CephObjectStore.gateway.type.

The Rook Operator has been zero-scaled for a while now due to b/6.

Change-Id: I30a836f273f4c1529f60fa9297c96b7aac412f59
---
 cluster/kube/cluster.libsonnet  | 2 +-
 cluster/kube/k0.libsonnet       | 2 --
 cluster/kube/lib/rook.libsonnet | 1 -
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/cluster/kube/cluster.libsonnet b/cluster/kube/cluster.libsonnet
index 6e9da288..fb0456c9 100644
--- a/cluster/kube/cluster.libsonnet
+++ b/cluster/kube/cluster.libsonnet
@@ -212,7 +212,7 @@ local pki = import "lib/pki.libsonnet";
         rook: rook.Operator {
             operator+: {
                 spec+: {
-                    replicas: 1,
+                    replicas: 0,
                 },
             },
         },
diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index 57d39d0b..9d14dbf5 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -121,7 +121,6 @@ local rook = import "lib/rook.libsonnet";
                         nodes: [
                             {
                                 name: "dcr01s22.hswaw.net",
-                                location: "rack=dcr01 host=dcr01s22",
                                 devices: [
                                     // https://github.com/rook/rook/issues/1228
                                     //{ name: "disk/by-id/wwan-0x" + wwan }
@@ -139,7 +138,6 @@ local rook = import "lib/rook.libsonnet";
                             },
                             {
                                 name: "dcr01s24.hswaw.net",
-                                location: "rack=dcr01 host=dcr01s22",
                                 devices: [
                                     // https://github.com/rook/rook/issues/1228
                                     //{ name: "disk/by-id/wwan-0x" + wwan }
diff --git a/cluster/kube/lib/rook.libsonnet b/cluster/kube/lib/rook.libsonnet
index c8e38a88..58103840 100644
--- a/cluster/kube/lib/rook.libsonnet
+++ b/cluster/kube/lib/rook.libsonnet
@@ -1219,7 +1219,6 @@ local oa = kube.OpenAPI;
             metadata+: cluster.metadata,
             spec: store.spec {
                 gateway: {
-                    type: "s3",
                     port: 80,
                     instances: 1,
                     allNodes: false,