From ef9e42021a0e06a9c22f3e80d2b69cce6a1edbaf Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 18 Nov 2025 14:20:44 +0100 Subject: [PATCH 1/5] fix: rename hbase-site.xml keys for restserver advertisement --- rust/operator-binary/src/hbase_controller.rs | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs index 8445d173..ba616ba4 100644 --- a/rust/operator-binary/src/hbase_controller.rs +++ b/rust/operator-binary/src/hbase_controller.rs @@ -593,16 +593,8 @@ fn build_rolegroup_config_map( } HbaseRole::RestServer => { hbase_site_config.insert( - "hbase.rest.hostname".to_string(), - "${env:HBASE_SERVICE_HOST}".to_string(), - ); - hbase_site_config.insert( - "hbase.rest.port".to_string(), - "${env:HBASE_SERVICE_PORT}".to_string(), - ); - hbase_site_config.insert( - "hbase.rest.info.port".to_string(), - "${env:HBASE_INFO_PORT}".to_string(), + "hbase.rest.endpoint".to_string(), + "${env:HBASE_SERVICE_HOST}:${env:HBASE_SERVICE_PORT}".to_string(), ); } }; From 8e03eb2803c59370542a687800b0b9f9adfd9513 Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 18 Nov 2025 14:34:19 +0100 Subject: [PATCH 2/5] add changelog entry --- CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b294bcb6..632b82d5 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,9 +4,10 @@ ### Added -- Add `hbase.rest.hostname`, `hbase.rest.port`, and `hbase.rest.info.port` properties to the restserver `hbase-site.xml` ([#708]). +- Add `hbase.rest.endpoint` property to the restserver `hbase-site.xml` ([#708], [#716]). [#708]: https://github.com/stackabletech/hbase-operator/pull/708 +[#716]: https://github.com/stackabletech/hbase-operator/pull/716 ## [25.11.0] - 2025-11-07 From 2b3269157f0470dc2b0f55b43bc327657b6823ab Mon Sep 17 00:00:00 2001 From: Xenia Date: Tue, 18 Nov 2025 15:43:42 +0100 Subject: [PATCH 3/5] Update rust/operator-binary/src/hbase_controller.rs Co-authored-by: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> --- rust/operator-binary/src/hbase_controller.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs index ba616ba4..24c29898 100644 --- a/rust/operator-binary/src/hbase_controller.rs +++ b/rust/operator-binary/src/hbase_controller.rs @@ -593,6 +593,8 @@ fn build_rolegroup_config_map( } HbaseRole::RestServer => { hbase_site_config.insert( + // N.B. a custom tag, so as not to interfere with HBase internals. + // The other roles use a patch to correctly resolve host/port. "hbase.rest.endpoint".to_string(), "${env:HBASE_SERVICE_HOST}:${env:HBASE_SERVICE_PORT}".to_string(), ); From ab6a4859a59b60be51936860ead550becae2fecb Mon Sep 17 00:00:00 2001 From: xeniape Date: Thu, 20 Nov 2025 08:43:18 +0100 Subject: [PATCH 4/5] adjust changelog entry --- CHANGELOG.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 632b82d5..8f16e4c8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,9 @@ ### Added -- Add `hbase.rest.endpoint` property to the restserver `hbase-site.xml` ([#708], [#716]). +- Add custom `hbase.rest.endpoint` property to the restserver `hbase-site.xml` ([#708], [#716]). + - The custom `hbase.rest.hostname` and native `hbase.rest.port` properties cannot be used for + discovery advertisement, as that would interfere with the internals of HBase restserver startup. [#708]: https://github.com/stackabletech/hbase-operator/pull/708 [#716]: https://github.com/stackabletech/hbase-operator/pull/716 From 042638f6303ca83e7e0db4066de42024ccb46ddf Mon Sep 17 00:00:00 2001 From: Xenia Date: Thu, 20 Nov 2025 09:56:42 +0100 Subject: [PATCH 5/5] Update CHANGELOG.md Co-authored-by: Razvan-Daniel Mihai <84674+razvan@users.noreply.github.com> --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8f16e4c8..350393c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,7 @@ - Add custom `hbase.rest.endpoint` property to the restserver `hbase-site.xml` ([#708], [#716]). - The custom `hbase.rest.hostname` and native `hbase.rest.port` properties cannot be used for - discovery advertisement, as that would interfere with the internals of HBase restserver startup. + discovery advertisement, as these should remain stable regardless of listener class used to expose the REST service. [#708]: https://github.com/stackabletech/hbase-operator/pull/708 [#716]: https://github.com/stackabletech/hbase-operator/pull/716