Fix the scale-2 variant and phase out pzoo

variants/scale-2/kafka-scale2-overrides.json

@@ -0,0 +1,10 @@
+[
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--override"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "default.replication.factor=2"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--override"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "min.insync.replicas=2"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--override"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "offsets.topic.replication.factor=2"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "--override"},
+  {"op": "add", "path": "/spec/template/spec/containers/0/command/-", "value": "offsets.topic.num.partitions=2"}
+]

variants/scale-2/kustomization.yaml

@@ -5,3 +5,10 @@ bases:
 patchesStrategicMerge:
 - kafka.yaml
 - zookeeper.yaml
+patchesJson6902:
+- target:
+    group: apps
+    version: v1
+    kind: StatefulSet
+    name: kafka
+  path: kafka-scale2-overrides.json

variants/scale-2/zookeeper.yaml

@@ -1,43 +1,28 @@
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  name: pzoo
-  namespace: kafka
----
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: pzoo
   namespace: kafka
 spec:
-  replicas: 2
-  template:
-    spec:
-      initContainers:
-      - name: init-config
-        env:
-        - name: PZOO_REPLICAS
-          value: '2'
-        - name: ZOO_REPLICAS
-          value: '1'
+  replicas: 0
 ---
 apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: zoo
   namespace: kafka
 spec:
-  replicas: 1
+  replicas: 2
   template:
     spec:
       initContainers:
       - name: init-config
         env:
         # There's no validation on these numbers adding up to a coherent zk config, so watch out
         - name: PZOO_REPLICAS
-          value: '2'
+          value: '0'
         - name: ZOO_REPLICAS
-          value: '1'
+          value: '2'
         - name: ID_OFFSET
-          value: '3'
+          value: '1'

variants/scale-3-5-nopzoo/kustomization.yaml

@@ -0,0 +1,4 @@
+bases:
+- ../scale-3-5
+patchesStrategicMerge:
+- ./only-zoo-5.yaml

variants/scale-3-5-nopzoo/only-zoo-5.yaml

@@ -0,0 +1,28 @@
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: pzoo
+  namespace: kafka
+spec:
+  replicas: 0
+---
+apiVersion: apps/v1
+kind: StatefulSet
+metadata:
+  name: zoo
+  namespace: kafka
+spec:
+  replicas: 5
+  template:
+    spec:
+      initContainers:
+      - name: init-config
+        env:
+        # There's no validation on these numbers adding up to a coherent zk config, so watch out
+        - name: PZOO_REPLICAS
+          value: '0'
+        - name: ZOO_REPLICAS
+          value: '5'
+        - name: ID_OFFSET
+          value: '1'