Upgrade to zookeeper 3.7.1

Author: amuraru

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

@@ -17,37 +17,40 @@ jobs:
           ref="${ref////-}"
           echo $ref
           echo ::set-output name=tag::$ref
-      - name: Build and push zookeeper-operator image
-        uses: docker/build-push-action@v1
-        with:
-          dockerfile: Dockerfile
-          build_args: VERSION=${{ steps.vars.outputs.tag }},GIT_SHA=${{ github.sha }}
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-          repository: adobe/zookeeper-operator
-          tag_with_ref: true
-          add_git_labels: true
-          always_pull: true
-          push: ${{ startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/zk') }}
       - name: Build and push zookeeper Apache image
         uses: docker/build-push-action@v1
+        if: ${{ startsWith(github.ref, 'refs/tags/zk') }}
         with:
           path: docker/zookeeper-image
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: adobe/zookeeper
-          tags: 3.6.3-apache-${{ steps.vars.outputs.tag }}
+          tags: 3.7.1-apache-${{ steps.vars.outputs.tag }}
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/zk') }}
       - name: Build and push zookeeper image
+        if: ${{ !startsWith(github.ref, 'refs/tags/zk') }}
         uses: docker/build-push-action@v1
         with:
           path: docker
           username: ${{ secrets.DOCKER_USERNAME }}
           password: ${{ secrets.DOCKER_PASSWORD }}
           repository: adobe/zookeeper
-          tags: 3.6.3-${{ steps.vars.outputs.tag }}
+          tags: 3.7.1-${{ steps.vars.outputs.tag }}
+          add_git_labels: true
+          always_pull: true
+          push: ${{ startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/zk') }}
+      - name: Build and push zookeeper-operator image
+        if: ${{ !startsWith(github.ref, 'refs/tags/zk') }}
+        uses: docker/build-push-action@v1
+        with:
+          dockerfile: Dockerfile
+          build_args: VERSION=${{ steps.vars.outputs.tag }},GIT_SHA=${{ github.sha }}
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+          repository: adobe/zookeeper-operator
+          tag_with_ref: true
           add_git_labels: true
           always_pull: true
           push: ${{ startsWith(github.ref, 'refs/tags/') && !startsWith(github.ref, 'refs/tags/zk') }}

README.md

@@ -28,7 +28,7 @@ The project is currently alpha. While no breaking API changes are currently plan
 
 ### Overview
 
-This operator runs a Zookeeper 3.6.3 cluster, and uses Zookeeper dynamic reconfiguration to handle node membership.
+This operator runs a Zookeeper 3.7.1 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).
 

charts/zookeeper/values.yaml

@@ -2,7 +2,7 @@ replicas: 3
 
 image:
   repository: adobe/zookeeper
-  tag: 3.6.3-0.2.11-adobe-20210610rc1
+  tag: 3.7.1-0.2.13-adobe-20211016
   pullPolicy: IfNotPresent
 
 triggerRollingRestart: false

docker/Dockerfile

@@ -12,11 +12,11 @@ FROM mcr.microsoft.com/openjdk/jdk:11-ubuntu
 RUN mkdir /zu
 COPY zu /zu
 WORKDIR /zu
-RUN ./gradlew --console=verbose --info shadowJar
+RUN ./gradlew shadowJar
 
-# use forked base zookeeper 3.6.3 docker image
+# use forked base zookeeper 3.7.1 docker image
 # that runs on openjdk-17
-FROM adobe/zookeeper:3.6.3-apache-zk-20211008
+FROM adobe/zookeeper:3.7.1-apache-zk-20211016
 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

@@ -36,8 +36,8 @@ RUN set -eux; \
 # Verify that gosu binary works
     gosu nobody true
 
-ARG SHORT_DISTRO_NAME=zookeeper-3.6.3
-ARG DISTRO_NAME=apache-zookeeper-3.6.3-bin
+ARG SHORT_DISTRO_NAME=zookeeper-3.7.1
+ARG DISTRO_NAME=apache-zookeeper-3.7.1-bin
 
 # Download Apache Zookeeper, verify its PGP signature, untar and clean up
 RUN set -eux; \
@@ -51,6 +51,7 @@ RUN set -eux; \
             https://www-us.apache.org/dist/ \
             https://www.apache.org/dist/ \
             https://archive.apache.org/dist/ \
+            https://github.com/adobe/zookeeper-operator/releases/download/0.2.13-adobe-20211008/ \
         ; do \
             if wget -q -O "$f" "$distUrl$distFile" && [ -s "$f" ]; then \
                 success=1; \
@@ -59,15 +60,15 @@ RUN set -eux; \
         done; \
         [ -n "$success" ]; \
     }; \
-    ddist "$DISTRO_NAME.tar.gz" "zookeeper/$SHORT_DISTRO_NAME/$DISTRO_NAME.tar.gz"; \
-    ddist "$DISTRO_NAME.tar.gz.asc" "zookeeper/$SHORT_DISTRO_NAME/$DISTRO_NAME.tar.gz.asc"; \
-    ddist "KEYS" "zookeeper/KEYS"; \
-    export GNUPGHOME="$(mktemp -d)"; \
-    gpg --import KEYS; \
-    gpg --batch --verify "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME.tar.gz"; \
+    ddist "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz"; \
+    # ddist "$DISTRO_NAME.tar.gz.asc" "zookeeper/$SHORT_DISTRO_NAME/$DISTRO_NAME.tar.gz.asc"; \
+    # ddist "KEYS" "zookeeper/KEYS"; \
+    # export GNUPGHOME="$(mktemp -d)"; \
+    # gpg --import KEYS; \
+    # gpg --batch --verify "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME.tar.gz"; \
     tar -zxf "$DISTRO_NAME.tar.gz"; \
     mv "$DISTRO_NAME/conf/"* "$ZOO_CONF_DIR"; \
-    rm -rf "$GNUPGHOME" "KEYS" "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME/docs"; \
+    rm -rf "$DISTRO_NAME.tar.gz" "$DISTRO_NAME.tar.gz.asc" "$DISTRO_NAME/docs"; \
     chown -R zookeeper:zookeeper "/$DISTRO_NAME"
 COPY opt/zkEnv.sh  $DISTRO_NAME/bin/zkEnv.sh
 

docker/zu/build.gradle.kts

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