Support zookeeper 3.8.1 (#689)

# Description test: https://ci.stackable.tech/view/02%20Operator%20Tests%20(custom)/job/zookeeper-operator-it-custom/53/ Co-authored-by: Malte Sander <[email protected]>
stackabletech · May 26, 2023 · a0f4a8a · a0f4a8a
1 parent 543091b
commit a0f4a8a
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 25 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
 - Generate OLM bundle for Release 23.4.0 ([#672]).
 - Expose `ZOOKEEPER_CLIENT_PORT` in discovery CM ([#675], [#676]).
 - Missing CRD defaults for `status.conditions` field ([#682]).
+- Support for ZooKeeper `3.8.1` ([#689]).
 
 ### Changed
 
@@ -24,6 +25,7 @@ All notable changes to this project will be documented in this file.
 [#676]: https://github.com/stackabletech/zookeeper-operator/pull/676
 [#680]: https://github.com/stackabletech/zookeeper-operator/pull/680
 [#682]: https://github.com/stackabletech/zookeeper-operator/pull/682
+[#689]: https://github.com/stackabletech/zookeeper-operator/pull/689
 
 ## [23.4.0] - 2023-04-17
 

diff --git a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: 0.0.0-dev
   servers:
     roleGroups:

diff --git a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2 b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: {{ versions.zookeeper }}
   servers:
     roleGroups:

diff --git a/docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-authentication.yaml b/docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-authentication.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: 0.0.0-dev
   clusterConfig:
     authentication:

diff --git a/docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-encryption.yaml b/docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-encryption.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: 0.0.0-dev
   clusterConfig:
     tls:

diff --git a/docs/modules/zookeeper/pages/config_properties.adoc b/docs/modules/zookeeper/pages/config_properties.adoc
@@ -9,7 +9,7 @@ metadata:
   name: simple
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: 0.0.0-dev
   servers:
     roleGroups:

diff --git a/docs/modules/zookeeper/partials/supported-versions.adoc b/docs/modules/zookeeper/partials/supported-versions.adoc
@@ -6,3 +6,4 @@
 - 3.6.3
 - 3.7.0
 - 3.8.0
+- 3.8.1
diff --git a/examples/simple-zookeeper-tls-cluster.yaml b/examples/simple-zookeeper-tls-cluster.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-zk
 spec:
   image:
-    productVersion: 3.8.0
+    productVersion: 3.8.1
     stackableVersion: 0.0.0-dev
   clusterConfig:
     authentication:

diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -51,7 +51,7 @@ mod tests {
           name: simple-zk
         spec:
           image:
-            productVersion: 3.8.0
+            productVersion: 3.8.1
             stackableVersion: 0.9.0
           clusterConfig:
             authentication:
@@ -126,7 +126,7 @@ mod tests {
           name: simple-zk
         spec:
           image:
-            productVersion: 3.8.0
+            productVersion: 3.8.1
             stackableVersion: 0.9.0
           clusterConfig:
             authentication:

diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -298,7 +298,7 @@ impl Configuration for ZookeeperConfigFragment {
                     reason: e.to_string(),
                 })?;
         let jvm_flags = [
-            format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar={METRICS_PORT}:/stackable/jmx/server.yaml"),
+            format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/server.yaml"),
             match logging_framework {
                 LoggingFramework::LOG4J => format!("-Dlog4j.configuration=file:{STACKABLE_LOG_CONFIG_DIR}/{LOG4J_CONFIG_FILE}"),
                 LoggingFramework::LOGBACK => format!("-Dlogback.configurationFile={STACKABLE_LOG_CONFIG_DIR}/{LOGBACK_CONFIG_FILE}"),
@@ -665,8 +665,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
         "#;
         let zookeeper: ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input");
         assert_eq!(
@@ -685,8 +685,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
           clusterConfig:
             tls:
               serverSecretClass: simple-zookeeper-client-tls
@@ -709,8 +709,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
           clusterConfig:
             tls:
               serverSecretClass: null
@@ -729,8 +729,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
           clusterConfig:
             tls:
               quorumSecretClass: simple-zookeeper-quorum-tls
@@ -755,8 +755,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
         "#;
         let zookeeper: ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input");
 
@@ -776,8 +776,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
           clusterConfig:
             tls:
               quorumSecretClass: simple-zookeeper-quorum-tls
@@ -799,8 +799,8 @@ mod tests {
           name: simple-zookeeper
         spec:
           image:
-            productVersion: "3.8.0"
-            stackableVersion: "0.8.0"
+            productVersion: "3.8.1"
+            stackableVersion: "0.0.0-dev"
           clusterConfig:
             tls:
               serverSecretClass: simple-zookeeper-server-tls

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -5,10 +5,10 @@ dimensions:
       - 3.5.8-stackable0.0.0-dev
       - 3.6.3-stackable0.0.0-dev
       - 3.7.0-stackable0.0.0-dev
-      - 3.8.0-stackable0.0.0-dev
+      - 3.8.1-stackable0.0.0-dev
   - name: zookeeper-latest
     values:
-      - 3.8.0-stackable0.0.0-dev
+      - 3.8.1-stackable0.0.0-dev
   - name: use-server-tls
     values:
       - "true"
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,3 +6,4 @@ @@
     - 3.6.3
     - 3.7.0
     - 3.8.0
+    - 3.8.1