chore: Bump tools ahead of 25.7.0 (#1090)

NickLarsenNZ · web-flow · commit 65ff72d5c150 · 2025-05-05T14:24:07.000Z
* chore(jmx_exporter): Bump products to use 1.2.0

* chore(tools): Bump kubectl (1.33.0 and yq (4.45.2)

* chore(cyclonedx-bom): Bump to 6.0.0

* chore: Update changelog

* chore: Changelog formatting
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -35,8 +35,12 @@ All notable changes to this project will be documented in this file.
 ### Changed
 
 - ubi-rust-builder: Bump Rust toolchain to 1.85.0, cargo-cyclonedx to 0.5.7, and cargo-auditable to 0.6.6 ([#1050]).
-- spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup. ([#1034])
-- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071])
+- spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup ([#1034]).
+- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071]).
+- jmx_exporter: Bump products to use `1.2.0` ([#1090]).
+- kubectl: Bump products to use `1.33.0` ([#1090]).
+- yq: Bump products to use `4.45.2` ([#1090]).
+- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]).
 
 ### Fixed
 
@@ -76,6 +80,7 @@ All notable changes to this project will be documented in this file.
 [#1054]: https://github.com/stackabletech/docker-images/pull/1054
 [#1055]: https://github.com/stackabletech/docker-images/pull/1055
 [#1056]: https://github.com/stackabletech/docker-images/pull/1056
+[#1090]: https://github.com/stackabletech/docker-images/pull/1090
 
 ## [25.3.0] - 2025-03-21
 
diff --git a/airflow/Dockerfile b/airflow/Dockerfile
@@ -29,6 +29,8 @@ ARG STATSD_EXPORTER
 ARG PYTHON
 ARG TARGETARCH
 ARG STACKABLE_USER_UID
+ARG S3FS
+ARG CYCLONEDX_BOM
 
 COPY airflow/constraints-${PRODUCT}-python${PYTHON}.txt /tmp/constraints.txt
 COPY --from=opa-auth-manager-builder /tmp/opa-auth-manager/dist/opa_auth_manager-0.1.0-py3-none-any.whl /tmp/
@@ -68,7 +70,7 @@ source /stackable/app/bin/activate
 pip install --no-cache-dir --upgrade pip
 pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT} --constraint /tmp/constraints.txt
 # Needed for pandas S3 integration to e.g. write and read csv and parquet files to/from S3
-pip install --no-cache-dir s3fs==2024.9.0 cyclonedx-bom==5.0.0
+pip install --no-cache-dir s3fs==${S3FS} cyclonedx-bom==${CYCLONEDX_BOM}
 # Needed for OIDC
 pip install --no-cache-dir Flask_OIDC==2.2.0 Flask-OpenID==1.3.1
 
diff --git a/airflow/versions.py b/airflow/versions.py
@@ -3,6 +3,8 @@
         "product": "2.9.3",
         "python": "3.9",
         "git_sync": "v4.4.0",
+        "s3fs": "2024.9.0",
+        "cyclonedx_bom": "6.0.0",
         "statsd_exporter": "0.28.0",
         "tini": "0.19.0",
         "vector": "0.43.1",
@@ -11,6 +13,8 @@
         "product": "2.10.4",
         "python": "3.12",
         "git_sync": "v4.4.0",
+        "s3fs": "2024.9.0",
+        "cyclonedx_bom": "6.0.0",
         "statsd_exporter": "0.28.0",
         "tini": "0.19.0",
         "vector": "0.43.1",
diff --git a/hadoop/versions.py b/hadoop/versions.py
@@ -4,7 +4,7 @@
         "java-base": "11",
         "java-devel": "11",
         "async_profiler": "2.9",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "protobuf": "3.7.1",
         "hdfs_utils": "0.4.0",
     },
@@ -13,7 +13,7 @@
         "java-base": "11",
         "java-devel": "11",
         "async_profiler": "2.9",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "protobuf": "3.7.1",
         "hdfs_utils": "0.4.0",
     },
@@ -22,7 +22,7 @@
         "java-base": "11",
         "java-devel": "11",
         "async_profiler": "2.9",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "protobuf": "3.7.1",
         "hdfs_utils": "0.4.0",
     },
@@ -31,7 +31,7 @@
         "java-base": "11",
         "java-devel": "11",
         "async_profiler": "2.9",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "protobuf": "3.7.1",
         "hdfs_utils": "0.4.1",
     },
diff --git a/hbase/versions.py b/hbase/versions.py
@@ -11,7 +11,7 @@
         "phoenix": "5.2.1",
         "hbase_profile": "2.4",
         "hadoop": "3.3.6",
-        "jmx_exporter": "1.1.0",  # update the stackable/jmx/config<version> folder too
+        "jmx_exporter": "1.2.0",  # update the stackable/jmx/config<version> folder too
         "opa_authorizer": "",  # only for HBase 2.6.1
         "delete_caches": "true",
     },
diff --git a/hive/versions.py b/hive/versions.py
@@ -1,7 +1,7 @@
 versions = [
     {
         "product": "3.1.3",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         # Hive 3 must be built with Java 8 but will run on Java 11
         "java-base": "11",
         "java-devel": "8",
@@ -13,7 +13,7 @@
     },
     {
         "product": "4.0.0",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
         "java-base": "11",
         "java-devel": "8",
@@ -25,7 +25,7 @@
     },
     {
         "product": "4.0.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         # Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
         "java-base": "11",
         "java-devel": "8",
diff --git a/kafka/versions.py b/kafka/versions.py
@@ -6,7 +6,7 @@
         "scala": "2.13",
         "kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
     {
         "product": "3.7.2",
@@ -15,7 +15,7 @@
         "scala": "2.13",
         "kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
     {
         "product": "3.8.0",
@@ -24,7 +24,7 @@
         "scala": "2.13",
         "kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
     {
         "product": "3.9.0",
@@ -33,6 +33,6 @@
         "scala": "2.13",
         "kcat": "1.7.0",
         "opa_authorizer": "1.5.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
 ]
diff --git a/omid/versions.py b/omid/versions.py
@@ -3,12 +3,12 @@
         "product": "1.1.2",
         "java-base": "11",
         "java-devel": "11",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
     {
         "product": "1.1.3-SNAPSHOT",
         "java-base": "11",
         "java-devel": "11",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
 ]
diff --git a/spark-k8s/versions.py b/spark-k8s/versions.py
@@ -13,7 +13,7 @@
         "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
         "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
         "vector": "0.43.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "tini": "0.19.0",
         "hbase_connector": "1.0.1",
     },
@@ -31,7 +31,7 @@
         "stax2_api": "4.2.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
         "woodstox_core": "6.5.1",  # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
         "vector": "0.43.1",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "tini": "0.19.0",
         "hbase_connector": "1.0.1",
     },
diff --git a/superset/Dockerfile b/superset/Dockerfile
@@ -40,6 +40,7 @@ ARG PYTHON
 ARG AUTHLIB
 ARG TARGETARCH
 ARG TARGETOS
+ARG CYCLONEDX_BOM
 
 COPY superset/constraints-${PRODUCT}.txt /tmp/constraints.txt
 COPY --from=opa-authorizer-builder /tmp/opa-authorizer/dist/opa_authorizer-0.1.0-py3-none-any.whl /tmp/
@@ -109,7 +110,7 @@ RUN python3 -m venv /stackable/app \
         --no-cache-dir \
         --upgrade \
         python-json-logger \
-        cyclonedx-bom \
+        cyclonedx-bom==${CYCLONEDX_BOM} \
     && if [ -n "$AUTHLIB" ]; then pip install Authlib==${AUTHLIB}; fi && \
     pip install --no-cache-dir /tmp/opa_authorizer-0.1.0-py3-none-any.whl
 
diff --git a/superset/versions.py b/superset/versions.py
@@ -2,6 +2,7 @@
     {
         "product": "4.0.2",
         "python": "3.9",
+        "cyclonedx_bom": "6.0.0",
         "vector": "0.43.1",
         "statsd_exporter": "0.28.0",
         "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.4.1/requirements/extra.txt#L7
@@ -10,6 +11,7 @@
     {
         "product": "4.1.1",
         "python": "3.9",  # 3.11 support was merged in January 2025 (two months after 4.1.1 release), 3.10 is not available in our UBI image, so we need to stay on 3.9 for now
+        "cyclonedx_bom": "6.0.0",
         "vector": "0.43.1",
         "statsd_exporter": "0.28.0",
         "authlib": "1.2.1",  # https://github.com/dpgaspar/Flask-AppBuilder/blob/release/4.5.0/requirements/extra.txt#L7
diff --git a/tools/versions.py b/tools/versions.py
@@ -1,9 +1,9 @@
 versions = [
     {
         "product": "1.0.0",
-        "kubectl_version": "1.31.1",
+        "kubectl_version": "1.33.0",
         "jq_version": "1.7.1",
         "stackable-base": "1.0.0",
-        "yq_version": "4.44.3",
+        "yq_version": "4.45.2",
     },
 ]
diff --git a/trino/versions.py b/trino/versions.py
@@ -3,21 +3,21 @@
         "product": "451",
         "java-base": "22",
         "java-devel": "22",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "trino-storage-connector": "451",
     },
     {
         "product": "455",
         "java-base": "22",
         "java-devel": "22",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "trino-storage-connector": "455",
     },
     {
         "product": "470",
         "java-base": "23",
         "java-devel": "23",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
         "trino-storage-connector": "470",
     },
 ]
diff --git a/zookeeper/versions.py b/zookeeper/versions.py
@@ -7,7 +7,7 @@
         # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java
         # returned: 1 -> [Help 1]
         "java-devel": "11",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
     {
         "product": "3.9.3",
@@ -17,6 +17,6 @@
         # zookeeper: Execution spotbugs of goal com.github.spotbugs:spotbugs-maven-plugin:4.0.0:spotbugs failed: Java
         # returned: 1 -> [Help 1]
         "java-devel": "11",
-        "jmx_exporter": "1.1.0",
+        "jmx_exporter": "1.2.0",
     },
 ]
