commit 1dbefed53716e3701a83842decdb0b7c3f3d1e53
author q3k <q3k@hackerspace.pl> Sat Sep 11 20:32:57 2021 +0000
committer Gerrit Code Review <gerrit@hackerspace.pl> Sat Sep 11 20:32:57 2021 +0000
tree be410f087e93063be107875bd1513b402422a344
parent 9f639694baa558832a15f38d316a179509554010
parent 4f0468fa26b696d6b37b2b0f16e93aa4ef4754fe

Merge "cluster/kube: remove ceph diff against k0 production"

cluster/kube/cluster.libsonnet

diff --git a/cluster/kube/cluster.libsonnet b/cluster/kube/cluster.libsonnet
index 6e9da28..fb0456c 100644
--- a/cluster/kube/cluster.libsonnet
+++ b/cluster/kube/cluster.libsonnet
@@ -212,7 +212,7 @@
         rook: rook.Operator {
             operator+: {
                 spec+: {
-                    replicas: 1,
+                    replicas: 0,
                 },
             },
         },

cluster/kube/k0.libsonnet

diff --git a/cluster/kube/k0.libsonnet b/cluster/kube/k0.libsonnet
index 57d39d0..9d14dbf 100644
--- a/cluster/kube/k0.libsonnet
+++ b/cluster/kube/k0.libsonnet
@@ -121,7 +121,6 @@
                         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 @@
                             },
                             {
                                 name: "dcr01s24.hswaw.net",
-                                location: "rack=dcr01 host=dcr01s22",
                                 devices: [
                                     // https://github.com/rook/rook/issues/1228
                                     //{ name: "disk/by-id/wwan-0x" + wwan }

cluster/kube/lib/rook.libsonnet

diff --git a/cluster/kube/lib/rook.libsonnet b/cluster/kube/lib/rook.libsonnet
index c8e38a8..5810384 100644
--- a/cluster/kube/lib/rook.libsonnet
+++ b/cluster/kube/lib/rook.libsonnet
@@ -1219,7 +1219,6 @@
             metadata+: cluster.metadata,
             spec: store.spec {
                 gateway: {
-                    type: "s3",
                     port: 80,
                     instances: 1,
                     allNodes: false,