From a9609c16ca9b4724aaaf8388e217c7fadd49f0f7 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 10:45:27 +0200 Subject: [PATCH 1/5] chore(jmx_exporter): Bump products to use 1.2.0 --- CHANGELOG.md | 3 ++- hadoop/versions.py | 8 ++++---- hbase/versions.py | 2 +- hive/versions.py | 6 +++--- kafka/versions.py | 8 ++++---- omid/versions.py | 4 ++-- spark-k8s/versions.py | 4 ++-- trino/versions.py | 6 +++--- zookeeper/versions.py | 4 ++-- 9 files changed, 23 insertions(+), 22 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a15846112..7ed7bce41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,7 +35,8 @@ 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-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup. ([#1034]). +- jmx_exporter: Bump products to use `1.2.0` ([#xxx]). ### Fixed diff --git a/hadoop/versions.py b/hadoop/versions.py index cb506b7b9..94f7a33dd 100644 --- 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 index 9cec0dd50..326b83c4d 100644 --- 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 folder too + "jmx_exporter": "1.2.0", # update the stackable/jmx/config folder too "opa_authorizer": "", # only for HBase 2.6.1 "delete_caches": "true", }, diff --git a/hive/versions.py b/hive/versions.py index 921c32b96..0e00a7d9f 100644 --- 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 index 5c0e64120..e58ff8d53 100644 --- 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 index e52294db1..6ae6947b5 100644 --- 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 index d00619a16..035e206fc 100644 --- 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/trino/versions.py b/trino/versions.py index 9205bd2dd..daaba71a9 100644 --- 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 index f7b7387fd..067e9d3f9 100644 --- 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", }, ] From 9ef4faf0f6c853317aceb08ab6d61f447251af47 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 11:50:27 +0200 Subject: [PATCH 2/5] chore(tools): Bump kubectl (1.33.0 and yq (4.45.2) --- CHANGELOG.md | 2 ++ tools/versions.py | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7ed7bce41..ffea3191b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -37,6 +37,8 @@ All notable changes to this project will be documented in this file. - 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]). - jmx_exporter: Bump products to use `1.2.0` ([#xxx]). +- kubectl: Bump products to use `1.33.0` ([#xxx]). +- yq: Bump products to use `4.45.2` ([#xxx]). ### Fixed diff --git a/tools/versions.py b/tools/versions.py index 6fd96cda0..78269452c 100644 --- 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", }, ] From ef9bd5eafdb77d81cd8d90fc7330a27d36480126 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 12:52:07 +0200 Subject: [PATCH 3/5] chore(cyclonedx-bom): Bump to 6.0.0 --- CHANGELOG.md | 1 + airflow/Dockerfile | 4 +++- airflow/versions.py | 4 ++++ superset/Dockerfile | 3 ++- superset/versions.py | 2 ++ 5 files changed, 12 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ffea3191b..cc695d67a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -39,6 +39,7 @@ All notable changes to this project will be documented in this file. - jmx_exporter: Bump products to use `1.2.0` ([#xxx]). - kubectl: Bump products to use `1.33.0` ([#xxx]). - yq: Bump products to use `4.45.2` ([#xxx]). +- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#xxx]). ### Fixed diff --git a/airflow/Dockerfile b/airflow/Dockerfile index 951f07ea9..fffa6fc25 100644 --- 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 index 21b34efb8..b48301b36 100644 --- 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/superset/Dockerfile b/superset/Dockerfile index 2ce4ea76b..285e0c9b0 100644 --- 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 index 793966157..b76d08621 100644 --- 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 From b8d19e71f54a47e711822c35de07470c832c7609 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 12:52:55 +0200 Subject: [PATCH 4/5] chore: Update changelog --- CHANGELOG.md | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cc695d67a..1f86aa7c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,10 +36,10 @@ All notable changes to this project will be documented in this file. - 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]). -- jmx_exporter: Bump products to use `1.2.0` ([#xxx]). -- kubectl: Bump products to use `1.33.0` ([#xxx]). -- yq: Bump products to use `4.45.2` ([#xxx]). -- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#xxx]). +- 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 @@ -79,6 +79,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 From d98b263476b42c1673d657c79ee209cebbec8559 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Mon, 5 May 2025 16:18:33 +0200 Subject: [PATCH 5/5] chore: Changelog formatting --- CHANGELOG.md | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c749720f0..f5b6ce61b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,9 +35,8 @@ 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-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]).