A cluster in three availability zones now get one persistent zk each, and two that can move automatically at node failureszookeeper-availability-zones

4 files changed, 15 insertions, 23 deletions

diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml
index b718ce1..58d8b6a 100644
--- a/zookeeper/10zookeeper-config.yml
+++ b/zookeeper/10zookeeper-config.yml
@@ -11,11 +11,11 @@ data:
     clientPort=2181
     initLimit=5
     syncLimit=2
-    server.1=pzoo-0.zoo:2888:3888:participant
-    server.2=pzoo-1.zoo:2888:3888:participant
-    server.3=pzoo-2.zoo:2888:3888:participant
-    server.4=zoo-3.zoo:2888:3888:participant
-    server.5=zoo-4.zoo:2888:3888:participant
+    server.1=pzoo-0.pzoo:2888:3888:participant
+    server.2=pzoo-1.pzoo:2888:3888:participant
+    server.3=pzoo-2.pzoo:2888:3888:participant
+    server.4=zoo-0.zoo:2888:3888:participant
+    server.5=zoo-1.zoo:2888:3888:participant
     
   log4j.properties: |-
     log4j.rootLogger=INFO, stdout
diff --git a/zookeeper/21zoo-service.yml b/zookeeper/21zoo-service.yml
index 00c33e1..93fb321 100644
--- a/zookeeper/21zoo-service.yml
+++ b/zookeeper/21zoo-service.yml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: pzoo
+  name: zoo
   namespace: kafka
 spec:
   ports:
@@ -12,4 +12,4 @@ spec:
   clusterIP: None
   selector:
     app: zookeeper
-    storage: persistent
+    storage: ephemeral
diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
index 925f4c5..993fd55 100644
--- a/zookeeper/50pzoo.yml
+++ b/zookeeper/50pzoo.yml
@@ -5,7 +5,7 @@ metadata:
   namespace: kafka
 spec:
   serviceName: "pzoo"
-  replicas: 5
+  replicas: 3
   template:
     metadata:
       labels:
diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
index 925f4c5..f041a9a 100644
--- a/zookeeper/51zoo.yml
+++ b/zookeeper/51zoo.yml
@@ -1,16 +1,16 @@
 apiVersion: apps/v1beta1
 kind: StatefulSet
 metadata:
-  name: pzoo
+  name: zoo
   namespace: kafka
 spec:
-  serviceName: "pzoo"
-  replicas: 5
+  serviceName: "zoo"
+  replicas: 2
   template:
     metadata:
       labels:
         app: zookeeper
-        storage: persistent
+        storage: ephemeral
       annotations:
         prometheus.io/scrape: "true"
         prometheus.io/port: "5556"
@@ -37,7 +37,7 @@ spec:
         - -c
         - >
           set -e;
-          export ZOOKEEPER_SERVER_ID=$((${HOSTNAME##*-} + 1));
+          export ZOOKEEPER_SERVER_ID=$((${HOSTNAME##*-} + 4));
           echo "${ZOOKEEPER_SERVER_ID:-1}" | tee /var/lib/zookeeper/data/myid;
           sed -i "s/server\.$ZOOKEEPER_SERVER_ID\=[a-z0-9.-]*/server.$ZOOKEEPER_SERVER_ID=0.0.0.0/" config/zookeeper.properties;
           cat config/zookeeper.properties;
@@ -58,13 +58,5 @@ spec:
       - name: config
         configMap:
           name: zookeeper-config
-  volumeClaimTemplates:
-  - metadata:
-      name: data
-      annotations:
-        volume.beta.kubernetes.io/storage-class: kafka-zookeeper
-    spec:
-      accessModes: [ "ReadWriteOnce" ]
-      resources:
-        requests:
-          storage: 1Gi
+      - name: data
+        emptyDir: {}