From 7cad2c4a293b1182eab941a964159c86916bf9c5 Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
Date: Wed, 8 Oct 2025 15:20:59 +0200
Subject: [PATCH 1/3] convert sed calls to config-utils where possible

---
 hbase/hbase/stackable/bin/hbase-entrypoint.sh | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/hbase/hbase/stackable/bin/hbase-entrypoint.sh b/hbase/hbase/stackable/bin/hbase-entrypoint.sh
index 04a9cc16f..f21d95de6 100755
--- a/hbase/hbase/stackable/bin/hbase-entrypoint.sh
+++ b/hbase/hbase/stackable/bin/hbase-entrypoint.sh
@@ -20,6 +20,7 @@ HBASE_UI_PORT_NAME="$4"
 
 # Needed for regionmover service and for hbase-site.xml (see below)
 HBASE_SERVICE_HOST=$(cat /stackable/listener/default-address/address)
+export HBASE_SERVICE_HOST
 
 REGION_MOVER_OPTS="--regionserverhost ${HBASE_SERVICE_HOST}:${HBASE_ROLE_SERVICE_PORT} --operation unload ${REGION_MOVER_OPTS}"
 
@@ -57,9 +58,9 @@ wait_for_termination() {
   set -e
 }
 
-# ##################################################################################################
+# #############################################################################
 # main
-# ##################################################################################################
+# #############################################################################
 mkdir -p /stackable/conf
 cp /stackable/tmp/hdfs/hdfs-site.xml /stackable/conf
 cp /stackable/tmp/hdfs/core-site.xml /stackable/conf
@@ -70,20 +71,20 @@ cp /stackable/tmp/log_config/log4j* /stackable/conf
 if [ -f /stackable/kerberos/krb5.conf ]; then
   KERBEROS_REALM=$(grep -oP 'default_realm = \K.*' /stackable/kerberos/krb5.conf)
   export KERBEROS_REALM
+  # the hdfs discovery files are not written by the hbase operator and use
+  # the dot notation, so they cannot be used with config-utils
   sed -i -e s/\$\{env\.KERBEROS_REALM\}/"${KERBEROS_REALM}"/g /stackable/conf/core-site.xml
-  sed -i -e s/\$\{env\.KERBEROS_REALM\}/"${KERBEROS_REALM}"/g /stackable/conf/hbase-site.xml
   sed -i -e s/\$\{env\.KERBEROS_REALM\}/"${KERBEROS_REALM}"/g /stackable/conf/hdfs-site.xml
 fi
 
 # Service endpoints
 HBASE_SERVICE_PORT=$(cat /stackable/listener/default-address/ports/"${HBASE_PORT_NAME}")
 HBASE_INFO_PORT=$(cat /stackable/listener/default-address/ports/"${HBASE_UI_PORT_NAME}")
-HBASE_LISTENER_ENDPOINT="$HBASE_SERVICE_HOST:$HBASE_INFO_PORT"
 
-sed -i -e s/\$\{HBASE_SERVICE_HOST\}/"${HBASE_SERVICE_HOST}"/g /stackable/conf/hbase-site.xml
-sed -i -e s/\$\{HBASE_SERVICE_PORT\}/"${HBASE_SERVICE_PORT}"/g /stackable/conf/hbase-site.xml
-sed -i -e s/\$\{HBASE_LISTENER_ENDPOINT\}/"${HBASE_LISTENER_ENDPOINT}"/g /stackable/conf/hbase-site.xml
-sed -i -e s/\$\{HBASE_INFO_PORT\}/"${HBASE_INFO_PORT}"/g /stackable/conf/hbase-site.xml
+export HBASE_SERVICE_PORT
+export HBASE_INFO_PORT
+
+config-utils template /stackable/conf/hbase-site.xml
 
 rm -f "${STACKABLE_LOG_DIR}/_vector/shutdown"
 prepare_signal_handlers

From 67dd5e26bf262bc3cf98a4efd7347e8ebbdad305 Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
Date: Wed, 8 Oct 2025 17:14:40 +0200
Subject: [PATCH 2/3] changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 523db2075..3789097bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,6 +43,7 @@ All notable changes to this project will be documented in this file.
 - trino-cli: Bump to 477 ([#1285]).
 - tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]).
 - testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]).
+- hbase: replace `sed` calls with `config-utils template` where possible ([#1301]).
 
 ### Removed
 
@@ -89,6 +90,7 @@ All notable changes to this project will be documented in this file.
 [#1292]: https://github.com/stackabletech/docker-images/pull/1292
 [#1293]: https://github.com/stackabletech/docker-images/pull/1293
 [#1296]: https://github.com/stackabletech/docker-images/pull/1296
+[#1301]: https://github.com/stackabletech/docker-images/pull/1301
 
 ## [25.7.0] - 2025-07-23
 

From 05484a15100e36cd3e66d125f26edfd20b2763c9 Mon Sep 17 00:00:00 2001
From: Andrew Kenworthy <andrew.kenworthy@stackable.tech>
Date: Thu, 9 Oct 2025 15:57:32 +0200
Subject: [PATCH 3/3] changelog order

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c21656090..152ed18f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -43,8 +43,8 @@ All notable changes to this project will be documented in this file.
 - trino-cli: Bump to 477 ([#1285]).
 - tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]).
 - testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]).
-- hbase: replace `sed` calls with `config-utils template` where possible ([#1301]).
 - hbase: move hbck2.env to hbase-operator-tools image and add log4j2 properties for this tool ([#1300]).
+- hbase: replace `sed` calls with `config-utils template` where possible ([#1301]).
 
 ### Removed
 
@@ -91,8 +91,8 @@ All notable changes to this project will be documented in this file.
 [#1292]: https://github.com/stackabletech/docker-images/pull/1292
 [#1293]: https://github.com/stackabletech/docker-images/pull/1293
 [#1296]: https://github.com/stackabletech/docker-images/pull/1296
-[#1301]: https://github.com/stackabletech/docker-images/pull/1301
 [#1300]: https://github.com/stackabletech/docker-images/pull/1300
+[#1301]: https://github.com/stackabletech/docker-images/pull/1301
 
 ## [25.7.0] - 2025-07-23