File tree Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Expand file tree Collapse file tree 2 files changed +9
-0
lines changed Original file line number Diff line number Diff line change @@ -7,6 +7,7 @@ All notable changes to this project will be documented in this file.
7
7
### Added
8
8
9
9
- Generate OLM bundle for Release 23.4.0 ([ #672 ] ).
10
+ - Expose ` ZOOKEEPER_PORT ` in discovery CM ([ #675 ] ).
10
11
11
12
### Changed
12
13
@@ -17,6 +18,7 @@ All notable changes to this project will be documented in this file.
17
18
[ #672 ] : https://github.com/stackabletech/zookeeper-operator/pull/672
18
19
[ #673 ] : https://github.com/stackabletech/zookeeper-operator/pull/673
19
20
[ #674 ] : https://github.com/stackabletech/zookeeper-operator/pull/674
21
+ [ #675 ] : https://github.com/stackabletech/zookeeper-operator/pull/675
20
22
21
23
## [ 23.4.0] - 2023-04-17
22
24
Original file line number Diff line number Diff line change @@ -63,6 +63,7 @@ pub async fn build_discovery_configmaps(
63
63
let mut discovery_configmaps = vec ! [ build_discovery_configmap(
64
64
zk,
65
65
owner,
66
+ zookeeper_security,
66
67
name. as_str( ) ,
67
68
& namespace,
68
69
controller_name,
@@ -76,6 +77,7 @@ pub async fn build_discovery_configmaps(
76
77
discovery_configmaps. push ( build_discovery_configmap (
77
78
zk,
78
79
owner,
80
+ zookeeper_security,
79
81
& format ! ( "{}-nodeport" , name) ,
80
82
& namespace,
81
83
controller_name,
@@ -95,6 +97,7 @@ pub async fn build_discovery_configmaps(
95
97
fn build_discovery_configmap (
96
98
zk : & ZookeeperCluster ,
97
99
owner : & impl Resource < DynamicType = ( ) > ,
100
+ zookeeper_security : & ZookeeperSecurity ,
98
101
name : & str ,
99
102
namespace : & str ,
100
103
controller_name : & str ,
@@ -138,6 +141,10 @@ fn build_discovery_configmap(
138
141
. add_data ( "ZOOKEEPER" , conn_str)
139
142
// Some clients don't support ZooKeeper's merged `hosts/chroot` format, so export them separately for these clients
140
143
. add_data ( "ZOOKEEPER_HOSTS" , hosts)
144
+ . add_data (
145
+ "ZOOKEEPER_PORT" ,
146
+ zookeeper_security. client_port ( ) . to_string ( ) ,
147
+ )
141
148
. add_data ( "ZOOKEEPER_CHROOT" , chroot. unwrap_or ( "/" ) )
142
149
. build ( )
143
150
. context ( BuildConfigMapSnafu )
You can’t perform that action at this time.
0 commit comments