Skip to content

Commit 910a58d

Browse files
committed
use OPENSEARCH_PATH_CONF for tls config
1 parent 95986a5 commit 910a58d

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

rust/operator-binary/src/controller/build/node_config.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -183,15 +183,15 @@ impl NodeConfig {
183183
);
184184
config.insert(
185185
CONFIG_OPTION_PLUGINS_SECURITY_SSL_HTTP_PEMCERT_FILEPATH.to_owned(),
186-
json!("${OPENSEARCH_HOME}/config/tls/tls.crt".to_string()),
186+
json!("${OPENSEARCH_PATH_CONF}/tls/tls.crt".to_string()),
187187
);
188188
config.insert(
189189
CONFIG_OPTION_PLUGINS_SECURITY_SSL_HTTP_PEMKEY_FILEPATH.to_owned(),
190-
json!("${OPENSEARCH_HOME}/config/tls/tls.key".to_string()),
190+
json!("${OPENSEARCH_PATH_CONF}/tls/tls.key".to_string()),
191191
);
192192
config.insert(
193193
CONFIG_OPTION_PLUGINS_SECURITY_SSL_HTTP_PEMTRUSTEDCAS_FILEPATH.to_owned(),
194-
json!("${OPENSEARCH_HOME}/config/tls/ca.crt".to_string()),
194+
json!("${OPENSEARCH_PATH_CONF}/tls/ca.crt".to_string()),
195195
);
196196
// TLS config for TRANSPORT port
197197
config.insert(
@@ -200,15 +200,15 @@ impl NodeConfig {
200200
);
201201
config.insert(
202202
CONFIG_OPTION_PLUGINS_SECURITY_SSL_TRANSPORT_PEMCERT_FILEPATH.to_owned(),
203-
json!("${OPENSEARCH_HOME}/config/tls/tls.crt".to_string()),
203+
json!("${OPENSEARCH_PATH_CONF}/tls/tls.crt".to_string()),
204204
);
205205
config.insert(
206206
CONFIG_OPTION_PLUGINS_SECURITY_SSL_TRANSPORT_PEMKEY_FILEPATH.to_owned(),
207-
json!("${OPENSEARCH_HOME}/config/tls/tls.key".to_string()),
207+
json!("${OPENSEARCH_PATH_CONF}/tls/tls.key".to_string()),
208208
);
209209
config.insert(
210210
CONFIG_OPTION_PLUGINS_SECURITY_SSL_TRANSPORT_PEMTRUSTEDCAS_FILEPATH.to_owned(),
211-
json!("${OPENSEARCH_HOME}/config/tls/ca.crt".to_string()),
211+
json!("${OPENSEARCH_PATH_CONF}/tls/ca.crt".to_string()),
212212
);
213213

214214
config

rust/operator-binary/src/controller/build/role_group_builder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -461,7 +461,7 @@ impl<'a> RoleGroupBuilder<'a> {
461461

462462
if self.cluster.cluster_config.tls.secret_class.is_some() {
463463
volume_mounts.push(VolumeMount {
464-
mount_path: format!("{opensearch_home}/config/tls"),
464+
mount_path: format!("{opensearch_path_conf}/tls"),
465465
name: TLS_VOLUME_NAME.to_string(),
466466
..VolumeMount::default()
467467
})

0 commit comments

Comments
 (0)