Skip to content

Commit 92fda20

Browse files
authored
chore: Update various references of versions to 3.9.3 (#922)
* chore: Update to 3.9.3 in getting_started scripts * chore: Update to 3.9.3 in usage guide * docs: Update to 3.9.3 on various pages * chore: Update unit test inputs to 3.9.3 * test: Add 3.9.3 to tested versions, change to 3.9.3 in latest version * chore: Update example CRD
1 parent 87462f1 commit 92fda20

17 files changed

+29
-27
lines changed

docs/modules/zookeeper/examples/getting_started/code/getting_started.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ zkCli_ls() {
7070
# tag::zkcli-ls[]
7171
kubectl run my-pod \
7272
--stdin --tty --quiet --restart=Never \
73-
--image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev -- \
73+
--image oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev -- \
7474
bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \
7575
kubectl logs my-pod && \
7676
kubectl delete pods my-pod

docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ zkCli_ls() {
7070
# tag::zkcli-ls[]
7171
kubectl run my-pod \
7272
--stdin --tty --quiet --restart=Never \
73-
--image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable{{ versions.zookeeper }} -- \
73+
--image oci.stackable.tech/sdp/zookeeper:3.9.3-stackable{{ versions.zookeeper }} -- \
7474
bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \
7575
kubectl logs my-pod && \
7676
kubectl delete pods my-pod

docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
clusterConfig:
88
listenerClass: external-unstable
99
image:
10-
productVersion: 3.9.2
10+
productVersion: 3.9.3
1111
servers:
1212
roleGroups:
1313
default:

docs/modules/zookeeper/examples/getting_started/code/zookeeper.yaml.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ spec:
77
clusterConfig:
88
listenerClass: external-unstable
99
image:
10-
productVersion: 3.9.2
10+
productVersion: 3.9.3
1111
servers:
1212
roleGroups:
1313
default:

docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-authentication.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.9.2
8+
productVersion: 3.9.3
99
clusterConfig:
1010
authentication:
1111
- authenticationClass: zk-client-tls # <1>

docs/modules/zookeeper/examples/usage_guide/example-cluster-tls-encryption.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.9.2
8+
productVersion: 3.9.3
99
clusterConfig:
1010
tls:
1111
serverSecretClass: tls # <1>

docs/modules/zookeeper/pages/reference/discovery.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ The name of the ConfigMap created for this discovery profile is `$BASENAME-nodep
2626

2727
Each discovery profile contains the following fields:
2828

29-
`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`
29+
`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`
3030
`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`
3131
`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
3232
`ZOOKEEPER_CLIENT_PORT`:: The port clients should use when connecting, e.g. `2282`

docs/modules/zookeeper/pages/usage_guide/overrides.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ servers:
3939

4040
All property values must be strings.
4141

42-
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].
42+
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].
4343

4444
=== Overriding entries in security.properties
4545

docs/modules/zookeeper/pages/znodes.adoc

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
= ZNodes
22
: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.
33

4-
Apache ZooKeeper organizes all data into a hierarchical system of https://zookeeper.apache.org/doc/r3.9.2/zookeeperProgrammers.html#ch_zkDataModel[ZNodes],
4+
Apache ZooKeeper organizes all data into a hierarchical system of https://zookeeper.apache.org/doc/r3.9.3/zookeeperProgrammers.html#ch_zkDataModel[ZNodes],
55
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.
66

77
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

docs/modules/zookeeper/partials/supported-versions.adoc

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
// This is a separate file, since it is used by both the direct ZooKeeper documentation, and the overarching
33
// Stackable Platform documentation.
44

5-
- 3.9.2 (LTS)
5+
- 3.9.2 (Deprecated)
6+
- 3.9.3 (LTS)

examples/simple-zookeeper-tls-cluster.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.9.2
8+
productVersion: 3.9.3
99
clusterConfig:
1010
authentication:
1111
- authenticationClass: zk-client-tls

rust/operator-binary/src/config/jvm.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ mod tests {
104104
name: simple-zookeeper
105105
spec:
106106
image:
107-
productVersion: "3.9.2"
107+
productVersion: "3.9.3"
108108
servers:
109109
roleGroups:
110110
default:
@@ -132,7 +132,7 @@ mod tests {
132132
name: simple-zookeeper
133133
spec:
134134
image:
135-
productVersion: "3.9.2"
135+
productVersion: "3.9.3"
136136
servers:
137137
config:
138138
resources:

rust/operator-binary/src/crd/affinity.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ mod tests {
4848
name: simple-zk
4949
spec:
5050
image:
51-
productVersion: 3.9.2
51+
productVersion: 3.9.3
5252
clusterConfig:
5353
authentication:
5454
- authenticationClass: zk-client-tls

rust/operator-binary/src/crd/mod.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ mod tests {
725725
name: simple-zookeeper
726726
spec:
727727
image:
728-
productVersion: "3.9.2"
728+
productVersion: "3.9.3"
729729
"#;
730730
let zookeeper: v1alpha1::ZookeeperCluster =
731731
serde_yaml::from_str(input).expect("illegal test input");
@@ -745,7 +745,7 @@ mod tests {
745745
name: simple-zookeeper
746746
spec:
747747
image:
748-
productVersion: "3.9.2"
748+
productVersion: "3.9.3"
749749
clusterConfig:
750750
tls:
751751
serverSecretClass: simple-zookeeper-client-tls
@@ -769,7 +769,7 @@ mod tests {
769769
name: simple-zookeeper
770770
spec:
771771
image:
772-
productVersion: "3.9.2"
772+
productVersion: "3.9.3"
773773
clusterConfig:
774774
tls:
775775
serverSecretClass: null
@@ -789,7 +789,7 @@ mod tests {
789789
name: simple-zookeeper
790790
spec:
791791
image:
792-
productVersion: "3.9.2"
792+
productVersion: "3.9.3"
793793
clusterConfig:
794794
tls:
795795
quorumSecretClass: simple-zookeeper-quorum-tls
@@ -815,7 +815,7 @@ mod tests {
815815
name: simple-zookeeper
816816
spec:
817817
image:
818-
productVersion: "3.9.2"
818+
productVersion: "3.9.3"
819819
"#;
820820
let zookeeper: v1alpha1::ZookeeperCluster =
821821
serde_yaml::from_str(input).expect("illegal test input");
@@ -836,7 +836,7 @@ mod tests {
836836
name: simple-zookeeper
837837
spec:
838838
image:
839-
productVersion: "3.9.2"
839+
productVersion: "3.9.3"
840840
clusterConfig:
841841
tls:
842842
quorumSecretClass: simple-zookeeper-quorum-tls
@@ -859,7 +859,7 @@ mod tests {
859859
name: simple-zookeeper
860860
spec:
861861
image:
862-
productVersion: "3.9.2"
862+
productVersion: "3.9.3"
863863
clusterConfig:
864864
tls:
865865
serverSecretClass: simple-zookeeper-server-tls

rust/operator-binary/src/zk_controller.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ mod tests {
10981098
name: simple-zookeeper
10991099
spec:
11001100
image:
1101-
productVersion: "3.9.2"
1101+
productVersion: "3.9.3"
11021102
servers:
11031103
roleGroups:
11041104
default:
@@ -1125,7 +1125,7 @@ mod tests {
11251125
name: simple-zookeeper
11261126
spec:
11271127
image:
1128-
productVersion: "3.9.2"
1128+
productVersion: "3.9.3"
11291129
servers:
11301130
configOverrides:
11311131
zoo.cfg:

scripts/docs_templating.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -euo pipefail
55
# in the 'docs' directory.
66
#
77
# dependencies
8-
# pip install jinja2-cli
8+
# pip install jinja2-cli[yaml]
99

1010
docs_dir="$(dirname "$0")/../docs"
1111
templating_vars_file="$docs_dir/templating_vars.yaml"

tests/test-definition.yaml

+4-3
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ dimensions:
33
- name: zookeeper
44
values:
55
- 3.9.2
6+
- 3.9.3
67
# To use a custom image, add a comma and the full name after the product version
7-
# - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev
8+
# - 3.9.3,oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev
89
- name: zookeeper-latest
910
values:
10-
- 3.9.2
11+
- 3.9.3
1112
# To use a custom image, add a comma and the full name after the product version
12-
# - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev
13+
# - 3.9.3,oci.stackable.tech/sdp/zookeeper:3.9.3-stackable0.0.0-dev
1314
- name: use-server-tls
1415
values:
1516
- "true"

0 commit comments

Comments
 (0)