Merge remote-tracking branch 'origin/main' into airflow-3.2.1

Author: NickLarsenNZ

CHANGELOG.md

@@ -15,11 +15,18 @@ All notable changes to this project will be documented in this file.
 - kafka: Add `3.9.2` and `4.2.1` ([#1483]).
 - trino: Add `481` ([#1518]).
 - airflow: Add `3.2.1` ([#1519]).
+- superset: Add `6.1.0` ([#1514])
+- zookeeper: Add `3.9.5` ([#1515])
 
 ### Changed
 
-- hbase: Update `hbase-opa-authorizer` from `0.1.0` to `0.2.0` and then `0.3.0` ([#1446], [#1454]).
+- airflow: Bump statsd_exporter to `0.30.0` ([#1524]).
 - ci: Bump `docker/login-action` from `v3.6.0` to `v4.1.0` and `stackabletech/actions` to `v0.14.3` to escape Node.js 20 deprecation ([#1507]).
+- hbase: Update `hbase-opa-authorizer` from `0.1.0` to `0.2.0` and then `0.3.0` ([#1446], [#1454]).
+- stackable-base: Bump `containerdebug` to `0.4.0` and  `config-utils` to `0.4.0` ([#1521]).
+- statsd_exporter: Bump version from `0.28.0` to `0.30.0` ([#1524]).
+  This uses a git mirror and patchable instead of sourcing from Nexus.
+- superset: Bump statsd_exporter to `0.30.0` ([#1524]).
 
 ### Fixed
 
@@ -32,6 +39,7 @@ All notable changes to this project will be documented in this file.
 
 ### Removed
 
+- nifi: Remove `1.28.1`, deprecate `2.7.2` ([#1520]).
 - opa: Remove `1.8.0` ([#1509]).
 
 [#1446]: https://github.com/stackabletech/docker-images/pull/1446
@@ -50,8 +58,13 @@ All notable changes to this project will be documented in this file.
 [#1509]: https://github.com/stackabletech/docker-images/pull/1509
 [#1510]: https://github.com/stackabletech/docker-images/pull/1510
 [#1512]: https://github.com/stackabletech/docker-images/pull/1512
+[#1514]: https://github.com/stackabletech/docker-images/pull/1514
+[#1515]: https://github.com/stackabletech/docker-images/pull/1515
 [#1518]: https://github.com/stackabletech/docker-images/pull/1518
 [#1519]: https://github.com/stackabletech/docker-images/pull/1519
+[#1520]: https://github.com/stackabletech/docker-images/pull/1520
+[#1521]: https://github.com/stackabletech/docker-images/pull/1521
+[#1524]: https://github.com/stackabletech/docker-images/pull/1524
 
 ## [26.3.0] - 2026-03-16
 

airflow/Dockerfile

@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
+# check=error=true;skip=InvalidDefaultArgInFrom,SecretsUsedInArgOrEnv
 # Disabled error checks:
 # - SecretsUsedInArgOrEnv : OPA_AUTH_MANAGER is a false positive and breaks the build.
-# check=error=true;skip=InvalidDefaultArgInFrom,SecretsUsedInArgOrEnv
 
 ARG GIT_SYNC_VERSION
 

airflow/boil-config.toml

@@ -3,7 +3,7 @@
 
 # Deprecated since SDP 25.11
 [versions."2.9.3".local-images]
-"shared/statsd-exporter" = "0.28.0"
+"shared/statsd-exporter" = "0.30.0"
 vector = "0.55.0"
 stackable-devel = "1.0.0"
 
@@ -23,7 +23,7 @@ nodejs-version = "20"
 
 # LTS
 [versions."3.0.6".local-images]
-"shared/statsd-exporter" = "0.28.0"
+"shared/statsd-exporter" = "0.30.0"
 vector = "0.55.0"
 stackable-devel = "1.0.0"
 
@@ -64,7 +64,7 @@ nodejs-version = "20"
 
 # Deprecated
 [versions."3.1.6".local-images]
-"shared/statsd-exporter" = "0.28.0"
+"shared/statsd-exporter" = "0.30.0"
 vector = "0.55.0"
 stackable-devel = "1.0.0"
 

nifi/boil-config.toml

@@ -1,17 +1,6 @@
 [metadata.registries]
 "oci.stackable.tech" = { namespace = "sdp" }
 
-[versions."1.28.1".local-images]
-java-base = "11"
-java-devel = "11"
-"shared/logback" = "1.3.14" # https://github.com/apache/nifi/blob/rel/nifi-1.28.1/pom.xml#L146
-
-[versions."1.28.1".build-arguments]
-git-sync-version = "v4.4.1"
-# Check for new versions at the upstream: https://github.com/stackabletech/nifi-opa-plugin/tags
-# Checkout a Patchable version (patch-series) for the new tag
-nifi-opa-authorizer-plugin-version = "0.5.0"
-
 [versions."2.6.0".local-images]
 java-base = "21"
 java-devel = "21"
@@ -27,6 +16,7 @@ nifi-opa-authorizer-plugin-version = "0.5.0"
 # Checkout a Patchable version (patch-series) for the new tag
 nifi-iceberg-bundle-version = "0.0.5"
 
+# Deprecated since 26.7.0
 [versions."2.7.2".local-images]
 java-base = "21" # As stated in GitHub README
 java-devel = "21"

opa/Dockerfile

@@ -1,6 +1,7 @@
+# syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
+# check=error=true;skip=InvalidDefaultArgInFrom
 
 ARG GOLANG_VERSION
-
 FROM oci.stackable.tech/sdp/library/golang:${GOLANG_VERSION} AS golang-image
 
 FROM local-image/stackable-devel AS multilog-builder

shared/statsd-exporter/Dockerfile

@@ -1,43 +1,65 @@
 # syntax=docker/dockerfile:1.16.0@sha256:e2dd261f92e4b763d789984f6eab84be66ab4f5f08052316d8eb8f173593acf7
-# check=error=true
+# check=error=true;skip=InvalidDefaultArgInFrom
+
+ARG GOLANG_VERSION
+FROM oci.stackable.tech/sdp/library/golang:${GOLANG_VERSION} AS golang-image
+
+FROM local-image/stackable-devel AS statsd-exporter-builder
 
-FROM local-image/stackable-base
 ARG PRODUCT_VERSION
+ARG CYCLONEDX_GOMOD_VERSION
 ARG STACKABLE_USER_UID
+ARG TARGETARCH
+ARG TARGETOS
+
+ENV CYCLONEDX_GOMOD_VERSION=$CYCLONEDX_GOMOD_VERSION
+ENV GOARCH=$TARGETARCH
+ENV GOOS=$TARGETOS
 
 WORKDIR /statsd_exporter
 
-RUN --mount=type=cache,id=go-statsd-exporter,uid=${STACKABLE_USER_UID},target=/go_cache <<EOF
+RUN <<EOF
 microdnf update
 
 # Tar and gzip are used to unpack the statsd_exporter source
-# Golang is used to build statsd_exporter
 # Git is needed by the cyclonedx-gomod tool to determine the version of statsd_exporter
 microdnf install \
   tar \
   gzip \
-  git \
-  golang
+  git
 
 microdnf clean all
 rm -rf /var/cache/yum
+EOF
 
+# Manually install Go since the dnf package is sometimes not recent enough
+COPY --from=golang-image /usr/local/go/ /usr/local/go/
+ENV PATH="/usr/local/go/bin:${PATH}"
+
+COPY --chown=${STACKABLE_USER_UID}:0 shared/statsd-exporter/stackable/patches/patchable.toml /statsd_exporter/src/shared/statsd-exporter/stackable/patches/patchable.toml
+COPY --chown=${STACKABLE_USER_UID}:0 shared/statsd-exporter/stackable/patches/${PRODUCT_VERSION} /statsd_exporter/src/shared/statsd-exporter/stackable/patches/${PRODUCT_VERSION}
+
+RUN --mount=type=cache,id=go-statsd-exporter,uid=${STACKABLE_USER_UID},target=/go_cache <<EOF
 export GOPATH=/go_cache
-# We use version 1.7.0, since a newer version of cyclonedx-gomod is not compatible with the version of Golang (>= 1.23.1)
-go install github.com/CycloneDX/cyclonedx-gomod/cmd/cyclonedx-gomod@v1.7.0
+go install "github.com/CycloneDX/cyclonedx-gomod/cmd/cyclonedx-gomod@v${CYCLONEDX_GOMOD_VERSION}"
 
-curl "https://repo.stackable.tech/repository/packages/statsd_exporter/statsd_exporter-${PRODUCT_VERSION}.src.tar.gz" | tar -xzC .
 (
-  cd "statsd_exporter-${PRODUCT_VERSION}" || exit
+  cd "$(/stackable/patchable --images-repo-root=src checkout shared/statsd-exporter ${PRODUCT_VERSION})"
+
+  # Create snapshot of the source code including custom patches
+  tar -czf /statsd_exporter/statsd-exporter-${PRODUCT_VERSION}-src.tar.gz .
 
   # Unfortunately, we need to create a dummy Git repository to allow cyclonedx-gomod to determine the version of statsd_exporter
+  rm .git
   git init
   git config user.email "fake.commiter@stackable.tech"
   git config user.name "Fake commiter"
   git commit --allow-empty --message "Fake commit, so that we can create a tag"
   git tag "v${PRODUCT_VERSION}"
-  go build -o ../statsd_exporter
-  $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output ../statsd_exporter-${PRODUCT_VERSION}.cdx.json -packages -files
+  go build -o /statsd_exporter/statsd_exporter
+  $GOPATH/bin/cyclonedx-gomod app -json -output-version 1.5 -output /statsd_exporter/statsd_exporter-${PRODUCT_VERSION}.cdx.json -packages -files
 )
 rm -rf "statsd_exporter-${PRODUCT_VERSION}"
+# set correct groups
+chmod -R g=u /statsd_exporter/
 EOF

shared/statsd-exporter/README.md

@@ -5,3 +5,21 @@ This is the Docker image that builds statsd_exporter.
 This image does _not_ need to be built manually.
 It will be built automatically if specified as a dependency in our `boil-config.toml` file.
 Which will then be transformed to a dependency in a Docker `buildx bake` file.
+
+## Updating
+
+This image uses patchable for applying patch sets before building from source.
+Our mirror can be found here:
+
+To update:
+
+> [!CAUTION]
+> Check the changes since the last version, eg:
+> <https://github.com/prometheus/statsd_exporter/compare/v0.29.0...v0.30.0>
+
+```shell
+STATSD_VERSION=0.29.0
+cargo patchable init version "shared/statsd-exporter" "$STATSD_VERSION" --base="v$STATSD_VERSION" --mirror
+```
+
+Apply any necessary patches (see previous version's patch set).

shared/statsd-exporter/boil-config.toml

@@ -1,5 +1,14 @@
 [metadata]
 "oci.stackable.tech" = { namespace = "sdp" }
 
-[versions."0.28.0".local-images]
-stackable-base = "1.0.0"
+[versions."0.30.0".build-arguments]
+# Find this in https://github.com/prometheus/statsd_exporter/blob/v0.30.0/go.mod
+# You can find the latest patch version at: https://go.dev/doc/devel/release
+# Mirror golang (no `v` prefix) via https://github.com/stackabletech/docker-images/actions/workflows/mirror.yaml
+# Note: currently mirrored to the `sdp` project, but should probably move elsewhere.
+golang-version = "1.25.11"
+# We use version 1.7.0, since a newer version of cyclonedx-gomod is not compatible with the version of Golang (>= 1.23.1)
+cyclonedx-gomod-version = "1.7.0"
+
+[versions."0.30.0".local-images]
+stackable-devel = "1.0.0"

shared/statsd-exporter/stackable/patches/0.30.0/patchable.toml

@@ -0,0 +1,2 @@
+mirror = "https://github.com/stackabletech/statsd_exporter.git"
+base = "4a7feb4d0ec9f1061b9e2f548810dd6efc6a294a"

shared/statsd-exporter/stackable/patches/patchable.toml

@@ -0,0 +1,2 @@
+upstream = "https://github.com/prometheus/statsd_exporter.git"
+default-mirror = "https://github.com/stackabletech/statsd_exporter.git"