Upgrade to zookeeper 3.8.3

Author: amuraru

.github/workflows/build-push-docker.yml

@@ -9,10 +9,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - name: Set up Go 1.17
+      - name: Set up Go 1.21
         uses: actions/setup-go@v2
         with:
-          go-version: 1.17
+          go-version: 1.21
         id: go
       - name: Set up Go for root
         run: |
@@ -40,7 +40,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: adobe/zookeeper
-          tags: 3.7.1-apache-${{ steps.vars.outputs.tag }}
+          tags: 3.8.3-apache-${{ steps.vars.outputs.tag }}
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/zk') }}
@@ -52,7 +52,7 @@ jobs:
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: adobe/zookeeper
-          tags: 3.7.1-${{ steps.vars.outputs.tag }}
+          tags: 3.8.3-${{ steps.vars.outputs.tag }}
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/zk') }}

README.md

@@ -6,29 +6,47 @@ The project is currently alpha. While no breaking API changes are currently plan
 
 ## Table of Contents
 
- * [Overview](#overview)
- * [Requirements](#requirements)
- * [Usage](#usage)    
-    * [Installation of the Operator](#install-the-operator)
-    * [Deploy a sample Zookeeper Cluster](#deploy-a-sample-zookeeper-cluster)
-    * [Deploy a sample ZooKeeper Cluster with Ephemeral Storage](#Deploy-a-sample-zookeeper-cluster-with-ephemeral-storage)
-    * [Deploy a sample Zookeeper Cluster to a cluster using Istio](#deploy-a-sample-zookeeper-cluster-with-istio)
-    * [Upgrade a Zookeeper Cluster](#upgrade-a-zookeeper-cluster)
-    * [Uninstall the Zookeeper Cluster](#uninstall-the-zookeeper-cluster)
-    * [Upgrade the Zookeeper Operator](#upgrade-the-operator)
-    * [Uninstall the Operator](#uninstall-the-operator)
-    * [The AdminServer](#the-adminserver)
- * [Development](#development)
-    * [Build the Operator Image](#build-the-operator-image)
-    * [Direct Access to Cluster](#direct-access-to-the-cluster)
-    * [Run the Operator Locally](#run-the-operator-locally)
-    * [Installation on GKE](#installation-on-google-kubernetes-engine)
-    * [Installation on Minikube](#installation-on-minikube)
+- [Zookeeper Operator](#zookeeper-operator)
+    - [Project status: alpha](#project-status-alpha)
+  - [Table of Contents](#table-of-contents)
+    - [Overview](#overview)
+  - [Requirements](#requirements)
+  - [Usage](#usage)
+    - [Install the operator](#install-the-operator)
+      - [Install via helm](#install-via-helm)
+      - [Manual deployment](#manual-deployment)
+    - [Deploy a sample Zookeeper cluster](#deploy-a-sample-zookeeper-cluster)
+      - [Install via helm](#install-via-helm-1)
+      - [Manual deployment](#manual-deployment-1)
+    - [Deploy a sample Zookeeper cluster with Ephemeral storage](#deploy-a-sample-zookeeper-cluster-with-ephemeral-storage)
+    - [Deploy a sample Zookeeper cluster with Istio](#deploy-a-sample-zookeeper-cluster-with-istio)
+    - [Upgrade a Zookeeper cluster](#upgrade-a-zookeeper-cluster)
+      - [Trigger the upgrade via helm](#trigger-the-upgrade-via-helm)
+      - [Trigger the upgrade manually](#trigger-the-upgrade-manually)
+    - [Upgrade the Operator](#upgrade-the-operator)
+    - [Uninstall the Zookeeper cluster](#uninstall-the-zookeeper-cluster)
+      - [Uninstall via helm](#uninstall-via-helm)
+      - [Manual uninstall](#manual-uninstall)
+    - [Uninstall the operator](#uninstall-the-operator)
+      - [Uninstall via helm](#uninstall-via-helm-1)
+      - [Manual uninstall](#manual-uninstall-1)
+    - [The AdminServer](#the-adminserver)
+  - [Development](#development)
+    - [Build the operator image](#build-the-operator-image)
+    - [Direct access to the cluster](#direct-access-to-the-cluster)
+    - [Run the operator locally](#run-the-operator-locally)
+    - [Installation on Google Kubernetes Engine](#installation-on-google-kubernetes-engine)
+    - [Installation on Minikube](#installation-on-minikube)
+      - [Minikube Setup](#minikube-setup)
+      - [Cluster Deployment](#cluster-deployment)
+      - [Zookeeper YAML  Exporter](#zookeeper-yaml--exporter)
+        - [How to build Zookeeper Operator](#how-to-build-zookeeper-operator)
+        - [How to use exporter](#how-to-use-exporter)
 
 
 ### Overview
 
-This operator runs a Zookeeper 3.7.1 cluster, and uses Zookeeper dynamic reconfiguration to handle node membership.
+This operator runs a Zookeeper 3.8.3 cluster, and uses Zookeeper dynamic reconfiguration to handle node membership.
 
 The operator itself is built with the [Operator framework](https://github.com/operator-framework/operator-sdk).
 
@@ -371,7 +389,7 @@ The list of available commands are
 ### Build the operator image
 
 Requirements:
-  - Go 1.17+
+  - Go 1.21+
 
 Use the `make` command to build the Zookeeper operator image.
 

charts/zookeeper/values.yaml

@@ -3,7 +3,7 @@ maxUnavailableReplicas:
 
 image:
   repository: adobe/zookeeper
-  tag: 3.7.1-0.2.15-adobe-20230422
+  tag: 3.8.3-0.2.15-adobe-20231117
   pullPolicy: IfNotPresent
 
 triggerRollingRestart: false

docker/Dockerfile

@@ -15,9 +15,9 @@ COPY zu /zu
 WORKDIR /zu
 RUN ./gradlew shadowJar
 
-# use forked base zookeeper 3.7.1 docker image
-# that runs on openjdk-17
-FROM adobe/zookeeper:3.7.1-apache-zk-20220513
+# use forked base zookeeper 3.8.3 docker image
+# that runs on openjdk-21
+FROM adobe/zookeeper:3.8.3-apache-zk-20231117
 COPY bin /usr/local/bin
 RUN chmod +x /usr/local/bin/*
 COPY --from=0 /zu/build/libs/zu.jar /opt/libs/

docker/zookeeper-image/Dockerfile

@@ -115,8 +115,8 @@ RUN set -eux; \
 # Verify that gosu binary works
     gosu nobody true
 
-ARG SHORT_DISTRO_NAME=zookeeper-3.7.1
-ARG DISTRO_NAME=apache-zookeeper-3.7.1-bin
+ARG SHORT_DISTRO_NAME=zookeeper-3.8.3
+ARG DISTRO_NAME=apache-zookeeper-3.8.3-bin
 
 # Download Apache Zookeeper, verify its PGP signature, untar and clean up
 RUN set -eux; \

docker/zu/build.gradle.kts

@@ -12,7 +12,7 @@ repositories {
 
 dependencies {
     implementation(kotlin("stdlib"))
-    implementation("org.apache.zookeeper:zookeeper:3.7.1")
+    implementation("org.apache.zookeeper:zookeeper:3.8.3")
 }
 
 tasks.withType<ShadowJar>() {

go.mod

@@ -1,6 +1,6 @@
 module github.com/pravega/zookeeper-operator
 
-go 1.20
+go 1.21
 
 require (
 	github.com/ghodss/yaml v1.0.0

go.sum

@@ -53,6 +53,7 @@ github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/
 github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
 github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
 github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
+github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
@@ -89,6 +90,7 @@ github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
 github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
+github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -107,6 +109,7 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
@@ -130,6 +133,7 @@ github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=
 github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=
+github.com/onsi/ginkgo/v2 v2.9.5/go.mod h1:tvAoo1QUJwNEU2ITftXTpR7R1RbCzoZUOs3RonqW57k=
 github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
 github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
 github.com/onsi/gomega v1.27.7 h1:fVih9JD6ogIiHUN6ePK7HJidyEDpWGVB5mzM7cWNXoU=
@@ -152,6 +156,7 @@ github.com/prometheus/procfs v0.9.0 h1:wzCHvIvM5SxWqYvwgVL7yJY8Lz3PKn49KQtpgMYJf
 github.com/prometheus/procfs v0.9.0/go.mod h1:+pB4zwohETzFnmlpe6yd2lSc+0/46IYZRB/chUwxUZY=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414 h1:AJNDS0kP60X8wwWFvbLPwDuojxubj9pbfK7pjHw0vKg=
 github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E=
 github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
@@ -182,6 +187,7 @@ go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/goleak v1.1.11/go.mod h1:cwTWslyiVhfpKIDGSZEM2HlOvcqm+tG4zioyIeLoqMQ=
 go.uber.org/goleak v1.2.1 h1:NBol2c7O1ZokfZ0LEU9K6Whx/KnwvepVetCUhtKja4A=
+go.uber.org/goleak v1.2.1/go.mod h1:qlT2yGI9QafXHhZZLxlSuNsMw3FFLxBr+tBRlmO1xH4=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/multierr v1.8.0 h1:dg6GjLku4EH+249NNmoIciG9N/jURbDG+pFlTkhzIC8=
 go.uber.org/multierr v1.8.0/go.mod h1:7EAYxJLBy9rStEaz58O2t4Uvip6FSURkq8/ppBp95ak=
@@ -267,6 +273,7 @@ golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4f
 golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.9.1 h1:8WMNJAz3zrtPmnYC7ISf5dEn3MT0gY7jBJfw27yrrLo=
+golang.org/x/tools v0.9.1/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=