Skip to content

Commit a0f4a8a

Browse files
committed
1 parent 543091b commit a0f4a8a

File tree

11 files changed

+28
-25
lines changed

11 files changed

+28
-25
lines changed

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ All notable changes to this project will be documented in this file.
99
- Generate OLM bundle for Release 23.4.0 ([#672]).
1010
- Expose `ZOOKEEPER_CLIENT_PORT` in discovery CM ([#675], [#676]).
1111
- Missing CRD defaults for `status.conditions` field ([#682]).
12+
- Support for ZooKeeper `3.8.1` ([#689]).
1213

1314
### Changed
1415

@@ -24,6 +25,7 @@ All notable changes to this project will be documented in this file.
2425
[#676]: https://github.com/stackabletech/zookeeper-operator/pull/676
2526
[#680]: https://github.com/stackabletech/zookeeper-operator/pull/680
2627
[#682]: https://github.com/stackabletech/zookeeper-operator/pull/682
28+
[#689]: https://github.com/stackabletech/zookeeper-operator/pull/689
2729

2830
## [23.4.0] - 2023-04-17
2931

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.8.0
8+
productVersion: 3.8.1
99
stackableVersion: 0.0.0-dev
1010
servers:
1111
roleGroups:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.8.0
8+
productVersion: 3.8.1
99
stackableVersion: {{ versions.zookeeper }}
1010
servers:
1111
roleGroups:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.8.0
8+
productVersion: 3.8.1
99
stackableVersion: 0.0.0-dev
1010
clusterConfig:
1111
authentication:

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.8.0
8+
productVersion: 3.8.1
99
stackableVersion: 0.0.0-dev
1010
clusterConfig:
1111
tls:

docs/modules/zookeeper/pages/config_properties.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ metadata:
99
name: simple
1010
spec:
1111
image:
12-
productVersion: 3.8.0
12+
productVersion: 3.8.1
1313
stackableVersion: 0.0.0-dev
1414
servers:
1515
roleGroups:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
- 3.6.3
77
- 3.7.0
88
- 3.8.0
9+
- 3.8.1

examples/simple-zookeeper-tls-cluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
name: simple-zk
66
spec:
77
image:
8-
productVersion: 3.8.0
8+
productVersion: 3.8.1
99
stackableVersion: 0.0.0-dev
1010
clusterConfig:
1111
authentication:

rust/crd/src/affinity.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ mod tests {
5151
name: simple-zk
5252
spec:
5353
image:
54-
productVersion: 3.8.0
54+
productVersion: 3.8.1
5555
stackableVersion: 0.9.0
5656
clusterConfig:
5757
authentication:
@@ -126,7 +126,7 @@ mod tests {
126126
name: simple-zk
127127
spec:
128128
image:
129-
productVersion: 3.8.0
129+
productVersion: 3.8.1
130130
stackableVersion: 0.9.0
131131
clusterConfig:
132132
authentication:

rust/crd/src/lib.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ impl Configuration for ZookeeperConfigFragment {
298298
reason: e.to_string(),
299299
})?;
300300
let jvm_flags = [
301-
format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent-0.16.1.jar={METRICS_PORT}:/stackable/jmx/server.yaml"),
301+
format!("-javaagent:/stackable/jmx/jmx_prometheus_javaagent.jar={METRICS_PORT}:/stackable/jmx/server.yaml"),
302302
match logging_framework {
303303
LoggingFramework::LOG4J => format!("-Dlog4j.configuration=file:{STACKABLE_LOG_CONFIG_DIR}/{LOG4J_CONFIG_FILE}"),
304304
LoggingFramework::LOGBACK => format!("-Dlogback.configurationFile={STACKABLE_LOG_CONFIG_DIR}/{LOGBACK_CONFIG_FILE}"),
@@ -665,8 +665,8 @@ mod tests {
665665
name: simple-zookeeper
666666
spec:
667667
image:
668-
productVersion: "3.8.0"
669-
stackableVersion: "0.8.0"
668+
productVersion: "3.8.1"
669+
stackableVersion: "0.0.0-dev"
670670
"#;
671671
let zookeeper: ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input");
672672
assert_eq!(
@@ -685,8 +685,8 @@ mod tests {
685685
name: simple-zookeeper
686686
spec:
687687
image:
688-
productVersion: "3.8.0"
689-
stackableVersion: "0.8.0"
688+
productVersion: "3.8.1"
689+
stackableVersion: "0.0.0-dev"
690690
clusterConfig:
691691
tls:
692692
serverSecretClass: simple-zookeeper-client-tls
@@ -709,8 +709,8 @@ mod tests {
709709
name: simple-zookeeper
710710
spec:
711711
image:
712-
productVersion: "3.8.0"
713-
stackableVersion: "0.8.0"
712+
productVersion: "3.8.1"
713+
stackableVersion: "0.0.0-dev"
714714
clusterConfig:
715715
tls:
716716
serverSecretClass: null
@@ -729,8 +729,8 @@ mod tests {
729729
name: simple-zookeeper
730730
spec:
731731
image:
732-
productVersion: "3.8.0"
733-
stackableVersion: "0.8.0"
732+
productVersion: "3.8.1"
733+
stackableVersion: "0.0.0-dev"
734734
clusterConfig:
735735
tls:
736736
quorumSecretClass: simple-zookeeper-quorum-tls
@@ -755,8 +755,8 @@ mod tests {
755755
name: simple-zookeeper
756756
spec:
757757
image:
758-
productVersion: "3.8.0"
759-
stackableVersion: "0.8.0"
758+
productVersion: "3.8.1"
759+
stackableVersion: "0.0.0-dev"
760760
"#;
761761
let zookeeper: ZookeeperCluster = serde_yaml::from_str(input).expect("illegal test input");
762762

@@ -776,8 +776,8 @@ mod tests {
776776
name: simple-zookeeper
777777
spec:
778778
image:
779-
productVersion: "3.8.0"
780-
stackableVersion: "0.8.0"
779+
productVersion: "3.8.1"
780+
stackableVersion: "0.0.0-dev"
781781
clusterConfig:
782782
tls:
783783
quorumSecretClass: simple-zookeeper-quorum-tls
@@ -799,8 +799,8 @@ mod tests {
799799
name: simple-zookeeper
800800
spec:
801801
image:
802-
productVersion: "3.8.0"
803-
stackableVersion: "0.8.0"
802+
productVersion: "3.8.1"
803+
stackableVersion: "0.0.0-dev"
804804
clusterConfig:
805805
tls:
806806
serverSecretClass: simple-zookeeper-server-tls

tests/test-definition.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ dimensions:
55
- 3.5.8-stackable0.0.0-dev
66
- 3.6.3-stackable0.0.0-dev
77
- 3.7.0-stackable0.0.0-dev
8-
- 3.8.0-stackable0.0.0-dev
8+
- 3.8.1-stackable0.0.0-dev
99
- name: zookeeper-latest
1010
values:
11-
- 3.8.0-stackable0.0.0-dev
11+
- 3.8.1-stackable0.0.0-dev
1212
- name: use-server-tls
1313
values:
1414
- "true"

0 commit comments

Comments
 (0)