Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Update various references of versions to 3.9.3 #922

Merged
merged 6 commits into from
Mar 12, 2025
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ spec:
clusterConfig:
listenerClass: external-unstable
image:
productVersion: 3.9.2
productVersion: 3.9.3
servers:
roleGroups:
default:
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ spec:
clusterConfig:
listenerClass: external-unstable
image:
productVersion: 3.9.2
productVersion: 3.9.3
servers:
roleGroups:
default:
Original file line number Diff line number Diff line change
@@ -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>
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ metadata:
name: simple-zk
spec:
image:
productVersion: 3.9.2
productVersion: 3.9.3
clusterConfig:
tls:
serverSecretClass: tls # <1>
2 changes: 1 addition & 1 deletion docs/modules/zookeeper/pages/reference/discovery.adoc
Original file line number Diff line number Diff line change
@@ -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`
2 changes: 1 addition & 1 deletion docs/modules/zookeeper/pages/usage_guide/overrides.adoc
Original file line number Diff line number Diff line change
@@ -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

2 changes: 1 addition & 1 deletion docs/modules/zookeeper/pages/znodes.adoc
Original file line number Diff line number Diff line change
@@ -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
3 changes: 2 additions & 1 deletion docs/modules/zookeeper/partials/supported-versions.adoc
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 1 addition & 1 deletion examples/simple-zookeeper-tls-cluster.yaml
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ metadata:
name: simple-zk
spec:
image:
productVersion: 3.9.2
productVersion: 3.9.3
clusterConfig:
authentication:
- authenticationClass: zk-client-tls
4 changes: 2 additions & 2 deletions rust/operator-binary/src/config/jvm.rs
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion rust/operator-binary/src/crd/affinity.rs
Original file line number Diff line number Diff line change
@@ -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
14 changes: 7 additions & 7 deletions rust/operator-binary/src/crd/mod.rs
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions rust/operator-binary/src/zk_controller.rs
Original file line number Diff line number Diff line change
@@ -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:
2 changes: 1 addition & 1 deletion scripts/docs_templating.sh
Original file line number Diff line number Diff line change
@@ -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"
7 changes: 4 additions & 3 deletions tests/test-definition.yaml
Original file line number Diff line number Diff line change
@@ -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"