Skip to content

Commit 51b2837

Browse files
committed
use listener service resolved in entrypoint script rather than passing through as as argument
1 parent 4309b9d commit 51b2837

File tree

2 files changed

+1
-27
lines changed

2 files changed

+1
-27
lines changed

rust/operator-binary/src/hbase_controller.rs

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -442,7 +442,6 @@ pub async fn reconcile_hbase(
442442
)?;
443443
let rg_statefulset = build_rolegroup_statefulset(
444444
hbase,
445-
&client.kubernetes_cluster_info,
446445
&hbase_role,
447446
&rolegroup,
448447
rolegroup_config,
@@ -789,7 +788,6 @@ fn build_rolegroup_service(
789788
#[allow(clippy::too_many_arguments)]
790789
fn build_rolegroup_statefulset(
791790
hbase: &v1alpha1::HbaseCluster,
792-
cluster_info: &KubernetesClusterInfo,
793791
hbase_role: &HbaseRole,
794792
rolegroup_ref: &RoleGroupRef<v1alpha1::HbaseCluster>,
795793
rolegroup_config: &HashMap<PropertyNameKind, BTreeMap<String, String>>,
@@ -897,10 +895,9 @@ fn build_rolegroup_statefulset(
897895
.image_from_product_image(resolved_product_image)
898896
.command(command())
899897
.args(vec![formatdoc! {"
900-
{entrypoint} {role} {domain} {port} {port_name} {ui_port_name}",
898+
{entrypoint} {role} {port} {port_name} {ui_port_name}",
901899
entrypoint = "/stackable/hbase/bin/hbase-entrypoint.sh".to_string(),
902900
role = role_name,
903-
domain = hbase_service_domain_name(hbase, rolegroup_ref, cluster_info)?,
904901
port = hbase.service_port(hbase_role).to_string(),
905902
port_name = match hbase_role {
906903
HbaseRole::Master => "master",
@@ -1222,28 +1219,6 @@ fn validate_cr(hbase: &v1alpha1::HbaseCluster) -> Result<()> {
12221219
Ok(())
12231220
}
12241221

1225-
/// Build the domain name of an HBase service pod.
1226-
/// The hbase-entrypoint.sh script uses this to build the fully qualified name of a pod
1227-
/// by appending it to the `HOSTNAME` environment variable.
1228-
/// This name is required by the RegionMover to function properly.
1229-
fn hbase_service_domain_name(
1230-
hbase: &v1alpha1::HbaseCluster,
1231-
rolegroup_ref: &RoleGroupRef<v1alpha1::HbaseCluster>,
1232-
cluster_info: &KubernetesClusterInfo,
1233-
) -> Result<String, Error> {
1234-
let hbase_cluster_name = rolegroup_ref.object_name();
1235-
let pod_namespace = hbase
1236-
.metadata
1237-
.namespace
1238-
.clone()
1239-
.context(ObjectHasNoNamespaceSnafu)?;
1240-
let cluster_domain = &cluster_info.cluster_domain;
1241-
1242-
Ok(format!(
1243-
"{hbase_cluster_name}.{pod_namespace}.svc.{cluster_domain}"
1244-
))
1245-
}
1246-
12471222
#[cfg(test)]
12481223
mod test {
12491224
use rstest::rstest;

tests/templates/kuttl/shutdown/30-install-hbase.yaml.j2

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ spec:
1515
clusterConfig:
1616
hdfsConfigMapName: test-hdfs
1717
zookeeperConfigMapName: test-znode
18-
listenerClass: "cluster-internal"
1918
{% if lookup('env', 'VECTOR_AGGREGATOR') %}
2019
vectorAggregatorConfigMapName: vector-aggregator-discovery
2120
{% endif %}

0 commit comments

Comments
 (0)