Transition to a single REPLICAS env (phasing out pzoo)

Author: solsson

nonroot/nonroot-image-zookeeper.yaml

@@ -9,7 +9,7 @@ spec:
       - name: zookeeper
         image: solsson/kafka:zookeeper-server-start-2.4.1@sha256:ad92d8e93b369a4c6a9df7b8a198081dfcdcda52e218b1e707b39d63e1897cfb
         args:
-        - /etc/kafka/zookeeper.properties.scale-5.$(POD_NAME)
+        - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME)
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -22,4 +22,4 @@ spec:
       - name: zookeeper
         image: solsson/kafka:zookeeper-server-start-2.4.1@sha256:ad92d8e93b369a4c6a9df7b8a198081dfcdcda52e218b1e707b39d63e1897cfb
         args:
-        - /etc/kafka/zookeeper.properties.scale-5.$(POD_NAME)
+        - /etc/kafka/zookeeper.properties.scale-$(REPLICAS).$(POD_NAME)

variants/scale-1/zookeeper.yaml

@@ -19,8 +19,8 @@ spec:
         env:
         - name: PZOO_REPLICAS
           value: '1'
-        - name: ZOO_REPLICAS
-          value: '0'
+        - name: REPLICAS
+          value: '1'
 ---
 apiVersion: apps/v1
 kind: StatefulSet
@@ -37,7 +37,12 @@ spec:
         # There's no validation on these numbers adding up to a coherent zk config, so watch out
         - name: PZOO_REPLICAS
           value: '1'
-        - name: ZOO_REPLICAS
-          value: '0'
+        - name: REPLICAS
+          value: '1'
         - name: ID_OFFSET
           value: '2'
+      containers:
+      - name: zookeeper
+        env:
+        - name: REPLICAS
+          value: '1'

variants/scale-2/zookeeper.yaml

@@ -22,7 +22,12 @@ spec:
         # 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
+        - name: REPLICAS
           value: '2'
         - name: ID_OFFSET
           value: '1'
+      containers:
+      - name: zookeeper
+        env:
+        - name: REPLICAS
+          value: '2'

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

@@ -22,7 +22,12 @@ spec:
         # 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
+        - name: REPLICAS
           value: '5'
         - name: ID_OFFSET
           value: '1'
+      containers:
+      - name: zookeeper
+        env:
+        - name: REPLICAS
+          value: '5'

zookeeper/10zookeeper-config.yml

@@ -14,11 +14,10 @@ data:
     export ZOOKEEPER_SERVER_ID=$((${HOSTNAME##*-} + $ID_OFFSET))
     echo "${ZOOKEEPER_SERVER_ID:-1}" | tee /var/lib/zookeeper/data/myid
     cp -Lur /etc/kafka-configmap/* /etc/kafka/
-    REPLICAS=$(( PZOO_REPLICAS + ZOO_REPLICAS ))
-    [ ! -z "$PZOO_REPLICAS" ] && [ ! -z "$ZOO_REPLICAS" ] && {
+    [ ! -z "$PZOO_REPLICAS" ] && [ ! -z "$REPLICAS" ] && {
       sed -i "s/^server\\./#server./" /etc/kafka/zookeeper.properties
       for N in $(seq $PZOO_REPLICAS); do echo "server.$N=pzoo-$(( $N - 1 )).pzoo:2888:3888:participant" >> /etc/kafka/zookeeper.properties; done
-      for N in $(seq $ZOO_REPLICAS); do echo "server.$(( $PZOO_REPLICAS + $N ))=zoo-$(( $N - 1 )).zoo:2888:3888:participant" >> /etc/kafka/zookeeper.properties; done
+      for N in $(seq $(( $REPLICAS - $PZOO_REPLICAS ))); do echo "server.$(( $PZOO_REPLICAS + $N ))=zoo-$(( $N - 1 )).zoo:2888:3888:participant" >> /etc/kafka/zookeeper.properties; done
     }
     sed -i "s/server\.$ZOOKEEPER_SERVER_ID\=[a-z0-9.-]*/server.$ZOOKEEPER_SERVER_ID=0.0.0.0/" /etc/kafka/zookeeper.properties
     ln -s /etc/kafka/zookeeper.properties /etc/kafka/zookeeper.properties.scale-$REPLICAS.$POD_NAME