From c58466bce199f02f3cb8960d26cb7076e50b91ed Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:04:43 +0100 Subject: [PATCH 1/6] chore: Update to 3.9.3 in getting_started scripts --- .../zookeeper/examples/getting_started/code/getting_started.sh | 2 +- .../examples/getting_started/code/getting_started.sh.j2 | 2 +- .../zookeeper/examples/getting_started/code/zookeeper.yaml | 2 +- .../zookeeper/examples/getting_started/code/zookeeper.yaml.j2 | 2 +- scripts/docs_templating.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh index f5d1c360..6f8b6cfc 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh @@ -70,7 +70,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev -- \ + --image oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 index 2727e0c1..407ab01e 100755 --- a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 +++ b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 @@ -70,7 +70,7 @@ zkCli_ls() { # tag::zkcli-ls[] kubectl run my-pod \ --stdin --tty --quiet --restart=Never \ - --image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable{{ versions.zookeeper }} -- \ + --image oci.stackable.tech/sdp/zookeeper:3.9.3-stackable{{ versions.zookeeper }} -- \ bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \ kubectl logs my-pod && \ kubectl delete pods my-pod diff --git a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml index 06a68e27..da3f9a7c 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml +++ b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml @@ -7,7 +7,7 @@ spec: clusterConfig: listenerClass: external-unstable image: - productVersion: 3.9.2 + productVersion: 3.9.3 servers: roleGroups: default: diff --git a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2 b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2 index 06a68e27..da3f9a7c 100644 --- a/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2 +++ b/docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2 @@ -7,7 +7,7 @@ spec: clusterConfig: listenerClass: external-unstable image: - productVersion: 3.9.2 + productVersion: 3.9.3 servers: roleGroups: default: diff --git a/scripts/docs_templating.sh b/scripts/docs_templating.sh index e4b945da..f241b2e3 100755 --- a/scripts/docs_templating.sh +++ b/scripts/docs_templating.sh @@ -5,7 +5,7 @@ set -euo pipefail # in the 'docs' directory. # # dependencies -# pip install jinja2-cli +# pip install jinja2-cli[yaml] docs_dir="$(dirname "$0")/../docs" templating_vars_file="$docs_dir/templating_vars.yaml" From fff6babeee9cd02ef72b130e8fd7d8298f370024 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:06:22 +0100 Subject: [PATCH 2/6] chore: Update to 3.9.3 in usage guide --- .../usage_guide/example-cluster-tls-authentication.yaml | 2 +- .../examples/usage_guide/example-cluster-tls-encryption.yaml | 2 +- docs/modules/zookeeper/pages/usage_guide/overrides.adoc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index c5dc19c2..d209313a 100644 --- 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.9.2 + productVersion: 3.9.3 clusterConfig: authentication: - authenticationClass: zk-client-tls # <1> 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 index aca8784d..25738466 100644 --- 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.9.2 + productVersion: 3.9.3 clusterConfig: tls: serverSecretClass: tls # <1> diff --git a/docs/modules/zookeeper/pages/usage_guide/overrides.adoc b/docs/modules/zookeeper/pages/usage_guide/overrides.adoc index ce09fb54..1cfed9ed 100644 --- a/docs/modules/zookeeper/pages/usage_guide/overrides.adoc +++ b/docs/modules/zookeeper/pages/usage_guide/overrides.adoc @@ -39,7 +39,7 @@ servers: All property values must be strings. -For a full list of configuration options refer to the Apache ZooKeeper https://zookeeper.apache.org/doc/r3.9.2/zookeeperAdmin.html#sc_configuration[Configuration Reference]. +For a full list of configuration options refer to the Apache ZooKeeper https://zookeeper.apache.org/doc/r3.9.3/zookeeperAdmin.html#sc_configuration[Configuration Reference]. === Overriding entries in security.properties From 10759638a121646fff5994e440939f7e2d350438 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:07:20 +0100 Subject: [PATCH 3/6] docs: Update to 3.9.3 on various pages --- docs/modules/zookeeper/pages/reference/discovery.adoc | 2 +- docs/modules/zookeeper/pages/znodes.adoc | 2 +- docs/modules/zookeeper/partials/supported-versions.adoc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/modules/zookeeper/pages/reference/discovery.adoc b/docs/modules/zookeeper/pages/reference/discovery.adoc index 34db31db..e48f9dd0 100644 --- a/docs/modules/zookeeper/pages/reference/discovery.adoc +++ b/docs/modules/zookeeper/pages/reference/discovery.adoc @@ -26,7 +26,7 @@ The name of the ConfigMap created for this discovery profile is `$BASENAME-nodep Each discovery profile contains the following fields: -`ZOOKEEPER`:: A connection string, as accepted by https://zookeeper.apache.org/doc/r3.9.2/apidocs/zookeeper-server/org/apache/zookeeper/ZooKeeper.html#ZooKeeper-java.lang.String-int-org.apache.zookeeper.Watcher-[the official Java client], e.g. `test-zk-server-default-0.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282,test-zk-server-default-1.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282/znode-4e169890-d2eb-4d62-9515-e4786f0ac58e` +`ZOOKEEPER`:: A connection string, as accepted by https://zookeeper.apache.org/doc/r3.9.3/apidocs/zookeeper-server/org/apache/zookeeper/ZooKeeper.html#ZooKeeper-java.lang.String-int-org.apache.zookeeper.Watcher-[the official Java client], e.g. `test-zk-server-default-0.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282,test-zk-server-default-1.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282/znode-4e169890-d2eb-4d62-9515-e4786f0ac58e` `ZOOKEEPER_HOSTS`:: A comma-separated list of `node1:port1,node2:port2,...`, e.g. `test-zk-server-default-0.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282,test-zk-server-default-1.test-zk-server-default.kuttl-test-proper-spaniel.svc.cluster.local:2282` `ZOOKEEPER_CHROOT`:: The name of the root ZNode associated with the discovery profile, should be used if (and only if) connecting using `ZOOKEEPER_HOSTS` (rather than `ZOOKEEPER`), e.g. `/znode-4e169890-d2eb-4d62-9515-e4786f0ac58e` in case of a ZNode discovery or `/` in case of a ZookeeperServer discovery `ZOOKEEPER_CLIENT_PORT`:: The port clients should use when connecting, e.g. `2282` diff --git a/docs/modules/zookeeper/pages/znodes.adoc b/docs/modules/zookeeper/pages/znodes.adoc index 7b228a78..de46a214 100644 --- a/docs/modules/zookeeper/pages/znodes.adoc +++ b/docs/modules/zookeeper/pages/znodes.adoc @@ -1,7 +1,7 @@ = ZNodes :description: Manage ZooKeeper ZNodes with the ZookeeperZnode resource. Each client should use a unique root ZNode to prevent conflicts. Network access to ZooKeeper is required. -Apache ZooKeeper organizes all data into a hierarchical system of https://zookeeper.apache.org/doc/r3.9.2/zookeeperProgrammers.html#ch_zkDataModel[ZNodes], +Apache ZooKeeper organizes all data into a hierarchical system of https://zookeeper.apache.org/doc/r3.9.3/zookeeperProgrammers.html#ch_zkDataModel[ZNodes], which act as both files (they can have data associated with them) and folders (they can contain other ZNodes) when compared to a traditional (POSIX-like) file system. In order to isolate different clients using the same ZooKeeper cluster, each client application should be assigned a unique root ZNode, which it can then organize diff --git a/docs/modules/zookeeper/partials/supported-versions.adoc b/docs/modules/zookeeper/partials/supported-versions.adoc index ea18a270..7c77e913 100644 --- a/docs/modules/zookeeper/partials/supported-versions.adoc +++ b/docs/modules/zookeeper/partials/supported-versions.adoc @@ -2,4 +2,5 @@ // This is a separate file, since it is used by both the direct ZooKeeper documentation, and the overarching // Stackable Platform documentation. -- 3.9.2 (LTS) +- 3.9.2 (Deprecated) +- 3.9.3 (LTS) From 06c36acf02d55d11622f4b5b73d29950f45b191e Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:08:57 +0100 Subject: [PATCH 4/6] chore: Update unit test inputs to 3.9.3 --- rust/operator-binary/src/config/jvm.rs | 4 ++-- rust/operator-binary/src/crd/affinity.rs | 2 +- rust/operator-binary/src/crd/mod.rs | 14 +++++++------- rust/operator-binary/src/zk_controller.rs | 4 ++-- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index 7f36bc6d..3d7f5e7a 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -104,7 +104,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" servers: roleGroups: default: @@ -132,7 +132,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" servers: config: resources: diff --git a/rust/operator-binary/src/crd/affinity.rs b/rust/operator-binary/src/crd/affinity.rs index 97d354ab..14321a6d 100644 --- a/rust/operator-binary/src/crd/affinity.rs +++ b/rust/operator-binary/src/crd/affinity.rs @@ -48,7 +48,7 @@ mod tests { name: simple-zk spec: image: - productVersion: 3.9.2 + productVersion: 3.9.3 clusterConfig: authentication: - authenticationClass: zk-client-tls diff --git a/rust/operator-binary/src/crd/mod.rs b/rust/operator-binary/src/crd/mod.rs index cd21c6d0..20eafffb 100644 --- a/rust/operator-binary/src/crd/mod.rs +++ b/rust/operator-binary/src/crd/mod.rs @@ -725,7 +725,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" "#; let zookeeper: v1alpha1::ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input"); @@ -745,7 +745,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" clusterConfig: tls: serverSecretClass: simple-zookeeper-client-tls @@ -769,7 +769,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" clusterConfig: tls: serverSecretClass: null @@ -789,7 +789,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" clusterConfig: tls: quorumSecretClass: simple-zookeeper-quorum-tls @@ -815,7 +815,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" "#; let zookeeper: v1alpha1::ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input"); @@ -836,7 +836,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" clusterConfig: tls: quorumSecretClass: simple-zookeeper-quorum-tls @@ -859,7 +859,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" clusterConfig: tls: serverSecretClass: simple-zookeeper-server-tls diff --git a/rust/operator-binary/src/zk_controller.rs b/rust/operator-binary/src/zk_controller.rs index a897eba2..cc9a42fa 100644 --- a/rust/operator-binary/src/zk_controller.rs +++ b/rust/operator-binary/src/zk_controller.rs @@ -1098,7 +1098,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" servers: roleGroups: default: @@ -1125,7 +1125,7 @@ mod tests { name: simple-zookeeper spec: image: - productVersion: "3.9.2" + productVersion: "3.9.3" servers: configOverrides: zoo.cfg: From 5ca8100357362fcd09cd1c924d930d4ba9cec395 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:09:39 +0100 Subject: [PATCH 5/6] test: Add 3.9.3 to tested versions, change to 3.9.3 in latest version --- tests/test-definition.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 0bdec9e9..3fbadd02 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -3,13 +3,14 @@ dimensions: - name: zookeeper values: - 3.9.2 + - 3.9.3 # To use a custom image, add a comma and the full name after the product version - # - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev + # - 3.9.3,oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev - name: zookeeper-latest values: - - 3.9.2 + - 3.9.3 # To use a custom image, add a comma and the full name after the product version - # - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev + # - 3.9.3,oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev - name: use-server-tls values: - "true" From 1fbdd0015abafadca3ab3e603c224b5997a5a4c9 Mon Sep 17 00:00:00 2001 From: Techassi Date: Wed, 12 Mar 2025 11:10:34 +0100 Subject: [PATCH 6/6] chore: Update example CRD --- examples/simple-zookeeper-tls-cluster.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/simple-zookeeper-tls-cluster.yaml b/examples/simple-zookeeper-tls-cluster.yaml index 35faf0e5..ea0b9590 100644 --- 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.9.2 + productVersion: 3.9.3 clusterConfig: authentication: - authenticationClass: zk-client-tls