Skip to content

Commit 701fb52

Browse files
Fix unit tests
1 parent 67a975c commit 701fb52

2 files changed

Lines changed: 42 additions & 5 deletions

File tree

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,7 @@ impl NodeConfig {
476476
mod tests {
477477
use std::collections::BTreeMap;
478478

479+
use pretty_assertions::assert_eq;
479480
use stackable_operator::{
480481
commons::{
481482
affinity::StackableAffinity,
@@ -698,13 +699,25 @@ mod tests {
698699
assert_eq!(
699700
EnvVarSet::new()
700701
.with_value(&EnvVarName::from_str_unsafe("TEST"), "value")
702+
.with_field_path(
703+
&EnvVarName::from_str_unsafe("_POD_NAME"),
704+
FieldPathEnvVar::Name
705+
)
701706
.with_value(
702707
&EnvVarName::from_str_unsafe("cluster.initial_cluster_manager_nodes"),
703708
"my-opensearch-cluster-nodes-default-0,my-opensearch-cluster-nodes-default-1",
704709
)
705710
.with_value(
706711
&EnvVarName::from_str_unsafe("discovery.seed_hosts"),
707-
"my-opensearch-cluster-discovery",
712+
"my-opensearch-seed-nodes.default.svc.cluster.local",
713+
)
714+
.with_value(
715+
&EnvVarName::from_str_unsafe("http.publish_host"),
716+
"$(_POD_NAME).my-opensearch-cluster-default-headless.default.svc.cluster.local",
717+
)
718+
.with_value(
719+
&EnvVarName::from_str_unsafe("network.publish_host"),
720+
"$(_POD_NAME).my-opensearch-cluster-default-headless.default.svc.cluster.local",
708721
)
709722
.with_field_path(
710723
&EnvVarName::from_str_unsafe("node.name"),
@@ -713,6 +726,10 @@ mod tests {
713726
.with_value(
714727
&EnvVarName::from_str_unsafe("node.roles"),
715728
"cluster_manager,data,ingest,remote_cluster_client"
729+
)
730+
.with_value(
731+
&EnvVarName::from_str_unsafe("transport.publish_host"),
732+
"$(_POD_NAME).my-opensearch-cluster-default-headless.default.svc.cluster.local",
716733
),
717734
node_config.environment_variables()
718735
);

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

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1196,9 +1196,25 @@ mod tests {
11961196
"-c"
11971197
],
11981198
"env": [
1199+
{
1200+
"name": "_POD_NAME",
1201+
"valueFrom": {
1202+
"fieldRef": {
1203+
"fieldPath": "metadata.name"
1204+
}
1205+
}
1206+
},
11991207
{
12001208
"name": "discovery.seed_hosts",
1201-
"value": "my-opensearch-cluster-seed-nodes"
1209+
"value": "my-opensearch-cluster-seed-nodes.default.svc.cluster.local"
1210+
},
1211+
{
1212+
"name": "http.publish_host",
1213+
"value": "$(_POD_NAME).my-opensearch-cluster-nodes-default-headless.default.svc.cluster.local"
1214+
},
1215+
{
1216+
"name": "network.publish_host",
1217+
"value": "$(_POD_NAME).my-opensearch-cluster-nodes-default-headless.default.svc.cluster.local"
12021218
},
12031219
{
12041220
"name": "node.name",
@@ -1211,7 +1227,11 @@ mod tests {
12111227
{
12121228
"name": "node.roles",
12131229
"value": "cluster_manager,data,ingest,remote_cluster_client"
1214-
}
1230+
},
1231+
{
1232+
"name": "transport.publish_host",
1233+
"value": "$(_POD_NAME).my-opensearch-cluster-nodes-default-headless.default.svc.cluster.local"
1234+
},
12151235
],
12161236
"image": "oci.stackable.tech/sdp/opensearch:3.1.0-stackable0.0.0-dev",
12171237
"imagePullPolicy": "Always",
@@ -1458,7 +1478,7 @@ mod tests {
14581478
"secrets.stackable.tech/backend.autotls.cert.lifetime": "1d",
14591479
"secrets.stackable.tech/class": "tls",
14601480
"secrets.stackable.tech/format": "tls-pem",
1461-
"secrets.stackable.tech/scope": "listener-volume=listener,pod"
1481+
"secrets.stackable.tech/scope": "service=my-opensearch-cluster-seed-nodes,listener-volume=listener,pod"
14621482
}
14631483
},
14641484
"spec": {
@@ -1484,7 +1504,7 @@ mod tests {
14841504
"secrets.stackable.tech/backend.autotls.cert.lifetime": "1d",
14851505
"secrets.stackable.tech/class": "tls",
14861506
"secrets.stackable.tech/format": "tls-pem",
1487-
"secrets.stackable.tech/scope": "service=my-opensearch-cluster-seed-nodes,listener-volume=listener,listener-volume=discovery-service-listener,pod"
1507+
"secrets.stackable.tech/scope": "listener-volume=listener,listener-volume=discovery-service-listener,pod"
14881508
}
14891509
},
14901510
"spec": {

0 commit comments

Comments
 (0)