Merge branch 'main' into chore/hbase-use-config-utils

Author: adwk67

.github/actionlint.yaml

@@ -2,4 +2,5 @@
 self-hosted-runner:
   # Ubicloud machines we are using
   labels:
-    - ubicloud-standard-8-arm
+    - ubicloud-standard-8-arm-ubuntu-2404
+    - ubicloud-standard-8-ubuntu-2404

.github/workflows/build_opensearch_dashboards.yaml

@@ -6,7 +6,7 @@ run-name: |
 on:
   workflow_dispatch:
   schedule:
-    - cron: '0 0 2/2 * *' # https://crontab.guru/#0_0_2/2_*_*
+    - cron: "0 0 2/2 * *" # https://crontab.guru/#0_0_2/2_*_*
   push:
     branches: [main]
     tags:
@@ -34,3 +34,4 @@ jobs:
       product-name: opensearch-dashboards
       sdp-version: ${{ github.ref_type == 'tag' && github.ref_name || '0.0.0-dev' }}
       registry-namespace: sdp
+      runners: ubicloud

.github/workflows/reusable_build_image.yaml

@@ -10,6 +10,13 @@ on:
       registry-namespace:
         required: true
         type: string
+      runners:
+        description: |
+          The type of runners used.
+          - `mixed`: x86_64 builds run on the GitHub hosted runners and the aarch64 builds run on the Ubicloud runners
+          - `ubicloud`: Both the x86_64 and the aarch64 builds run on the Ubicloud runners
+        default: mixed
+        type: string
     secrets:
       harbor-robot-secret:
         description: The secret for the Harbor robot user used to push images and manifest
@@ -19,8 +26,33 @@ on:
         required: true
 
 jobs:
-  generate_matrix:
-    name: Generate Version List
+  generate_runner_dimension:
+    name: Generate Runner Dimension
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        with:
+          persist-credentials: false
+      - id: runners
+        shell: bash
+        env:
+          RUNNERS_TYPE: ${{ inputs.runners }}
+        run: |
+          if [ "$RUNNERS_TYPE" == "mixed" ]; then
+            RUNNERS=$(jq --compact-output < .github/workflows/runners/mixed.json)
+            echo "RUNNERS=$RUNNERS" | tee -a "$GITHUB_OUTPUT"
+          elif [ "$RUNNERS_TYPE" == "ubicloud" ]; then
+            RUNNERS=$(jq --compact-output < .github/workflows/runners/ubicloud.json)
+            echo "RUNNERS=$RUNNERS" | tee -a "$GITHUB_OUTPUT"
+          else
+            echo "Invalid runners type, expected 'mixed' or 'ubicloud'"
+            exit 1
+          fi
+    outputs:
+      runners: ${{ steps.runners.outputs.RUNNERS }}
+
+  generate_version_dimension:
+    name: Generate Version Dimension
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -35,17 +67,17 @@ jobs:
 
   build:
     name: Build/Publish ${{ matrix.versions }}-${{ matrix.runner.arch }} Image
-    needs: [generate_matrix]
+    needs:
+      - generate_version_dimension
+      - generate_runner_dimension
     permissions:
       id-token: write
     runs-on: ${{ matrix.runner.name }}
     strategy:
       fail-fast: false
       matrix:
-        runner:
-          - {name: "ubuntu-latest", arch: "amd64"}
-          - {name: "ubicloud-standard-8-arm-ubuntu-2404", arch: "arm64"}
-        versions: ${{ fromJson(needs.generate_matrix.outputs.versions) }}
+        versions: ${{ fromJson(needs.generate_version_dimension.outputs.versions) }}
+        runner: ${{ fromJson(needs.generate_runner_dimension.outputs.runners) }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -76,14 +108,14 @@ jobs:
 
   publish_manifests:
     name: Build/Publish ${{ matrix.versions }} Manifests
-    needs: [generate_matrix, build]
+    needs: [generate_version_dimension, build]
     permissions:
       id-token: write
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        versions: ${{ fromJson(needs.generate_matrix.outputs.versions) }}
+        versions: ${{ fromJson(needs.generate_version_dimension.outputs.versions) }}
     steps:
       - name: Checkout Repository
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -101,7 +133,7 @@ jobs:
 
   notify:
     name: Failure Notification
-    needs: [generate_matrix, build, publish_manifests]
+    needs: [generate_version_dimension, build, publish_manifests]
     runs-on: ubuntu-latest
     if: failure() || (github.run_attempt > 1 && !cancelled())
     steps:

.github/workflows/runners/mixed.json

@@ -0,0 +1,10 @@
+[
+  {
+    "name": "ubuntu-latest",
+    "arch": "amd64"
+  },
+  {
+    "name": "ubicloud-standard-8-arm-ubuntu-2404",
+    "arch": "arm64"
+  }
+]

.github/workflows/runners/ubicloud.json

@@ -0,0 +1,10 @@
+[
+  {
+    "name": "ubicloud-standard-8-ubuntu-2404",
+    "arch": "amd64"
+  },
+  {
+    "name": "ubicloud-standard-8-arm-ubuntu-2404",
+    "arch": "arm64"
+  }
+]

CHANGELOG.md

@@ -21,7 +21,7 @@ All notable changes to this project will be documented in this file.
 - opa: Add `1.8.0` ([#1279]).
 - spark: Add `3.5.7` ([#1280]).
 - spark-connect-client: Add `3.5.7` ([#1280]).
-- superset: Add `4.1.4`  ([#1284]).
+- superset: Add `4.1.4` ([#1284]).
 - spark: Add `4.0.1` ([#1286]).
 - spark-connect-client: Add `4.0.1` ([#1286]).
 - trino/trino-storage-connector: Add `477` ([#1285]).
@@ -44,6 +44,7 @@ All notable changes to this project will be documented in this file.
 - 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]).
 
 ### Removed
 
@@ -91,6 +92,7 @@ All notable changes to this project will be documented in this file.
 [#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
 
 ## [25.7.0] - 2025-07-23
 

hbase/hbase-operator-tools/Dockerfile

@@ -21,10 +21,11 @@ ARG DELETE_CACHES="true"
 # The variable names are intentionally passed to envsubst in single-quotes,
 # so that they are not expanded. Disabling ShellCheck rules in a Dockerfile
 # does not work, so please ignore the according warning (SC2016).
-COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbck2.env /stackable/bin/
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/bin/hbck2.env /stackable/bin/
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/patchable.toml /stackable/src/hbase/hbase-operator-tools/stackable/patches/patchable.toml
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION} /stackable/src/hbase/hbase-operator-tools/stackable/patches/${HBASE_OPERATOR_TOOLS_VERSION}
 COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase/stackable/bin/hbase-entrypoint.sh /stackable/bin/
+COPY --chown=${STACKABLE_USER_UID}:0 hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties /tmp/log4j2-hbck.properties
 
 COPY --from=hbase-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hbase /stackable/patched-libs/maven/org/apache/hbase
 COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 /stackable/patched-libs/maven/org/apache/hadoop /stackable/patched-libs/maven/org/apache/hadoop
@@ -84,6 +85,9 @@ if [ "${DELETE_CACHES}" = "true" ] ; then
   rm -rf /stackable/.cache/*
 fi
 
+mkdir -p /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf
+mv /tmp/log4j2-hbck.properties /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/conf/log4j2-hbck.properties
+
 # set correct groups
 chmod --recursive g=u /stackable
 EOF

hbase/hbase/stackable/bin/hbck2.env renamed to hbase/hbase-operator-tools/stackable/bin/hbck2.env

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+export LOG4J_CONFIGURATION_FILE=/stackable/hbase-operator-tools/conf/log4j2-hbck.properties
+
 exec /stackable/hbase-${PATCHED_HBASE_VERSION}/bin/hbase hbck \
   -j /stackable/hbase-operator-tools-${FULL_HBASE_OPERATOR_TOOLS_VERSION}/hbase-hbck2/hbase-hbck2-${PATCHED_HBASE_OPERATOR_TOOLS_VERSION}.jar \
   "$@"

hbase/hbase-operator-tools/stackable/conf/log4j2-hbck.properties

@@ -0,0 +1,12 @@
+status = warn
+dest = err
+name = PropertiesConfig
+
+# Console appender
+appender.console.type = Console
+appender.console.target = SYSTEM_ERR
+appender.console.name = console
+appender.console.layout.type = PatternLayout
+appender.console.layout.pattern = %d{ISO8601} %-5p [%t%notEmpty{ %X}] %c{2}: %.1000m%n
+
+rootLogger = WARN,console