From 9cb9c1e7ae97f96f6ea08a55e16be9ac29f99815 Mon Sep 17 00:00:00 2001
From: y0psolo <lionel.herbet@gmail.com>
Date: Fri, 27 Nov 2020 10:52:50 +0100
Subject: [PATCH] Upgrade to zookeeper 3.6.2 (#305)

* Upgrade to zookeeper 3.6.2

Signed-off-by: Lionel Herbet <lionel.herbet@gmail.com>

* fix operator version

Signed-off-by: Lionel Herbet <lionel.herbet@gmail.com>
---
 repository/zookeeper/README.md                              | 6 ++++--
 repository/zookeeper/operator/operator.yaml                 | 4 ++--
 repository/zookeeper/operator/templates/bootstrap.sh.yaml   | 1 +
 repository/zookeeper/operator/templates/statefulset.yaml    | 2 +-
 repository/zookeeper/operator/templates/validation.yaml     | 2 +-
 .../zookeeper/tests/zookeeper-upgrade-test/00-install.yaml  | 2 +-
 .../zookeeper/tests/zookeeper-upgrade-test/01-resize.yaml   | 2 +-
 7 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/repository/zookeeper/README.md b/repository/zookeeper/README.md
index daf5502..f698c7c 100644
--- a/repository/zookeeper/README.md
+++ b/repository/zookeeper/README.md
@@ -4,12 +4,14 @@ The KUDO Zookeeper operator creates, configures and manages [Apache Zookeeper](h
 
 ## Getting started
 
-The latest stable version of Zookeeper operator is `0.3.1`
+The latest stable version of Zookeeper operator is `0.3.3`
 
 ## Version Chart
 
 | KUDO Zookeeper Version | Apache Zookeeper Version |
 | ---------------------- | ------------------------ |
+| 0.3.3                  | 3.6.2                    |
+| 0.3.2                  | 3.4.14                   |
 | 0.3.1                  | 3.4.14                   |
 | 0.3.0                  | 3.4.14                   |
-| latest                 | 3.4.14                   |
+| latest                 | 3.6.2                    |
diff --git a/repository/zookeeper/operator/operator.yaml b/repository/zookeeper/operator/operator.yaml
index b647088..cc117d1 100644
--- a/repository/zookeeper/operator/operator.yaml
+++ b/repository/zookeeper/operator/operator.yaml
@@ -1,8 +1,8 @@
 apiVersion: kudo.dev/v1beta1
 name: "zookeeper"
-operatorVersion: "0.3.2"
+operatorVersion: "0.3.3"
 kudoVersion: 0.10.0
-appVersion: 3.4.14
+appVersion: 3.6.2
 kubernetesVersion: 1.14.8
 maintainers:
   - name: Alena Varkockova
diff --git a/repository/zookeeper/operator/templates/bootstrap.sh.yaml b/repository/zookeeper/operator/templates/bootstrap.sh.yaml
index 7187547..b146eb4 100644
--- a/repository/zookeeper/operator/templates/bootstrap.sh.yaml
+++ b/repository/zookeeper/operator/templates/bootstrap.sh.yaml
@@ -192,6 +192,7 @@ data:
     maxSessionTimeout=$MAX_SESSION_TIMEOUT
     autopurge.snapRetainCount=$SNAP_RETAIN_COUNT
     autopurge.purgeInteval=$PURGE_INTERVAL
+    4lw.commands.whitelist=srvr, ruok
 
     EOF
         if [ $SERVERS -gt 1 ]; then
diff --git a/repository/zookeeper/operator/templates/statefulset.yaml b/repository/zookeeper/operator/templates/statefulset.yaml
index 8298b0c..6b371e7 100644
--- a/repository/zookeeper/operator/templates/statefulset.yaml
+++ b/repository/zookeeper/operator/templates/statefulset.yaml
@@ -30,7 +30,7 @@ spec:
       containers:
         - name: kubernetes-zookeeper
           imagePullPolicy: {{ .Params.IMAGE_PULL_POLICY }}
-          image: "zookeeper:3.4.14"
+          image: "zookeeper:3.6.2"
           resources:
             requests:
               memory: {{ .Params.MEMORY }}
diff --git a/repository/zookeeper/operator/templates/validation.yaml b/repository/zookeeper/operator/templates/validation.yaml
index 331d171..6c31238 100644
--- a/repository/zookeeper/operator/templates/validation.yaml
+++ b/repository/zookeeper/operator/templates/validation.yaml
@@ -11,7 +11,7 @@ spec:
       containers:
         - name: kubernetes-zookeeper
           imagePullPolicy: {{ .Params.IMAGE_PULL_POLICY }}
-          image: "zookeeper:3.4.14"
+          image: "zookeeper:3.6.2"
           env:
             - name: CONN
               value: {{ if gt (int .Params.NODE_COUNT) 0 }} {{ .Name }}-zookeeper-0.{{ .Name }}-hs:{{ .Params.CLIENT_PORT }}{{- $root := . -}}{{ range $i, $v := untilStep 1 (int .Params.NODE_COUNT) 1 }},{{ $root.Name }}-zookeeper-{{ $v }}.{{ $root.Name }}-hs:{{ $root.Params.CLIENT_PORT }}{{ end }}{{ end }}
diff --git a/repository/zookeeper/tests/zookeeper-upgrade-test/00-install.yaml b/repository/zookeeper/tests/zookeeper-upgrade-test/00-install.yaml
index 2cef7b2..2ac05f0 100644
--- a/repository/zookeeper/tests/zookeeper-upgrade-test/00-install.yaml
+++ b/repository/zookeeper/tests/zookeeper-upgrade-test/00-install.yaml
@@ -4,7 +4,7 @@ metadata:
   name: zk
 spec:
   operatorVersion:
-    name: zookeeper-3.4.14-0.3.1
+    name: zookeeper-3.6.2-0.3.3
     namespace: default
     kind: OperatorVersion
   name: "zk"
diff --git a/repository/zookeeper/tests/zookeeper-upgrade-test/01-resize.yaml b/repository/zookeeper/tests/zookeeper-upgrade-test/01-resize.yaml
index d72e5f0..12e8bcc 100644
--- a/repository/zookeeper/tests/zookeeper-upgrade-test/01-resize.yaml
+++ b/repository/zookeeper/tests/zookeeper-upgrade-test/01-resize.yaml
@@ -4,7 +4,7 @@ metadata:
   name: zk
 spec:
   operatorVersion:
-    name: zookeeper-3.4.14-0.3.1
+    name: zookeeper-3.6.2-0.3.3
     namespace: default
     kind: OperatorVersion
   name: "zk"