Merge pull request #227 from Yolean/fix-zookeeper-persistence

Fix Zookeeper persistence
Yolean · Dec 2, 2018 · e1d3f6f · e1d3f6f
2 parents d3043d3 + 57d8200
commit e1d3f6f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ If you begin to rely on this kafka setup we recommend you fork, for example to e
 | ----- | ------ | ---------- |
 | v5.0.1 | 1.11+ | Fixes Zookeeper persistence [#227](https://github.com/Yolean/kubernetes-kafka/pull/227) |
 | v5.0  | 1.11+  | Destabilize because in Docker we want Java 11 [#197](https://github.com/Yolean/kubernetes-kafka/pull/197) [#191](https://github.com/Yolean/kubernetes-kafka/pull/191) |
+| v4.3.1 | 1.9+  | Critical Zookeeper persistence fix [#228](https://github.com/Yolean/kubernetes-kafka/pull/228) |
 | v4.3  | 1.9+   | Adds a prpper shutdown hook [207](https://github.com/Yolean/kubernetes-kafka/pull/207) |
 | v4.2  | 1.9+   | Kafka 1.0.2 and tools upgrade |
 | v4.1  | 1.9+   | Kafka 1.0.1 new [default](#148) [config](#170) |

diff --git a/zookeeper/10zookeeper-config.yml b/zookeeper/10zookeeper-config.yml
@@ -9,6 +9,7 @@ data:
     set -e
     set -x
 
+    [ -d /var/lib/zookeeper/data ] || mkdir /var/lib/zookeeper/data
     [ -z "$ID_OFFSET" ] && ID_OFFSET=1
     export ZOOKEEPER_SERVER_ID=$((${HOSTNAME##*-} + $ID_OFFSET))
     echo "${ZOOKEEPER_SERVER_ID:-1}" | tee /var/lib/zookeeper/data/myid

diff --git a/zookeeper/50pzoo.yml b/zookeeper/50pzoo.yml
@@ -31,7 +31,7 @@ spec:
         - name: config
           mountPath: /etc/kafka
         - name: data
-          mountPath: /var/lib/zookeeper/data
+          mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
         image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
@@ -57,7 +57,7 @@ spec:
             cpu: 10m
             memory: 100Mi
           limits:
-            memory: 100Mi
+            memory: 120Mi
         readinessProbe:
           exec:
             command:
@@ -68,7 +68,7 @@ spec:
         - name: config
           mountPath: /etc/kafka
         - name: data
-          mountPath: /var/lib/zookeeper/data
+          mountPath: /var/lib/zookeeper
       volumes:
       - name: configmap
         configMap:

diff --git a/zookeeper/51zoo.yml b/zookeeper/51zoo.yml
@@ -34,7 +34,7 @@ spec:
         - name: config
           mountPath: /etc/kafka
         - name: data
-          mountPath: /var/lib/zookeeper/data
+          mountPath: /var/lib/zookeeper
       containers:
       - name: zookeeper
         image: solsson/kafka:2.1.0@sha256:ac3f06d87d45c7be727863f31e79fbfdcb9c610b51ba9cf03c75a95d602f15e1
@@ -60,7 +60,7 @@ spec:
             cpu: 10m
             memory: 100Mi
           limits:
-            memory: 100Mi
+            memory: 120Mi
         readinessProbe:
           exec:
             command:
@@ -71,7 +71,7 @@ spec:
         - name: config
           mountPath: /etc/kafka
         - name: data
-          mountPath: /var/lib/zookeeper/data
+          mountPath: /var/lib/zookeeper
       volumes:
       - name: configmap
         configMap: