Skip to content

Commit b97535a

Browse files
NickLarsenNZNickLarsenNZ
authored
Merge branch 'main' into chore/spark-1080
2 parents 2d188c5 + 2b43530 commit b97535a

File tree

24 files changed

+72
-199
lines changed

24 files changed

+72
-199
lines changed

‎.github/ISSUE_TEMPLATE/update-base-ubi-rust-builders.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,7 @@ Add/Change/Remove anything that isn't applicable anymore
5151
> This list should be completed by the assignee(s), once respective PRs have been merged. Once all items have been
5252
> checked, the issue can be moved into _Development: Done_.
5353
54-
- Done for [ubi8-rust-builder/Dockerfile](https://github.com/stackabletech/docker-images/blob/main/ubi8-rust-builder/Dockerfile)
55-
- Done for [ubi9-rust-builder/Dockerfile](https://github.com/stackabletech/docker-images/blob/main/ubi9-rust-builder/Dockerfile)
54+
- [ ] Done for [ubi9-rust-builder/Dockerfile](https://github.com/stackabletech/docker-images/blob/main/ubi9-rust-builder/Dockerfile)
5655
- [ ] Can build the image locally
5756
- [ ] Can build an operator image
5857

‎.github/workflows/ubi-rust-builder.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
fail-fast: false
2020
matrix:
2121
runner: ["ubuntu-latest", "ubicloud-standard-8-arm"]
22-
ubi-version: ["ubi8", "ubi9"]
22+
ubi-version: ["ubi9"]
2323
runs-on: ${{ matrix.runner }}
2424
steps:
2525
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
@@ -59,7 +59,7 @@ jobs:
5959
strategy:
6060
fail-fast: false
6161
matrix:
62-
ubi-version: ["ubi8", "ubi9"]
62+
ubi-version: ["ubi9"]
6363
runs-on: ubuntu-latest
6464
needs: ["build"]
6565
steps:

‎CHANGELOG.md‎

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,19 @@ All notable changes to this project will be documented in this file.
3131
`check-permissions-ownership.sh` provided in stackable-base image ([#1025]).
3232
- zookeeper: check for correct permissions and ownerships in /stackable folder via
3333
`check-permissions-ownership.sh` provided in stackable-base image ([#1043]).
34+
- java: Add JDK 24 ([#1097]).
3435

3536
### Changed
3637

3738
- ubi-rust-builder: Bump Rust toolchain to 1.85.0, cargo-cyclonedx to 0.5.7, and cargo-auditable to 0.6.6 ([#1050]).
38-
- spark-k8s: Include spark-connect jars. Replace OpenJDK with Temurin JDK. Cleanup. ([#1034])
39-
- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071])
39+
- ubi9-rust-builder: Bump base image and update protoc to `30.2` ([#1091]).
40+
- spark-k8s: Include spark-connect jars, replace OpenJDK with Temurin JDK, cleanup ([#1034]).
41+
- spark-connect-client: Image is now completely based on spark-k8s and includes JupyterLab and other demo dependencies ([#1071]).
42+
- jmx_exporter: Bump products to use `1.2.0` ([#1090]).
43+
- kubectl: Bump products to use `1.33.0` ([#1090]).
44+
- yq: Bump products to use `4.45.2` ([#1090]).
45+
- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]).
46+
- vector: Bump to `0.46.1` ([#1098]).
4047

4148
### Fixed
4249

@@ -57,6 +64,8 @@ All notable changes to this project will be documented in this file.
5764

5865
- ci: Remove Nexus steps from build, mirror and release workflows ([#1056]).
5966
Also remove the old release workflow.
67+
- zookeeper: Remove 3.9.2 ([#1093]).
68+
- Remove ubi8-rust-builder image ([#1091]).
6069
- spark: remove 3.5.2 and update dependencies for 3.5.5 ([#1094])
6170

6271
[#1025]: https://github.com/stackabletech/docker-images/pull/1025
@@ -77,7 +86,12 @@ All notable changes to this project will be documented in this file.
7786
[#1054]: https://github.com/stackabletech/docker-images/pull/1054
7887
[#1055]: https://github.com/stackabletech/docker-images/pull/1055
7988
[#1056]: https://github.com/stackabletech/docker-images/pull/1056
89+
[#1090]: https://github.com/stackabletech/docker-images/pull/1090
90+
[#1091]: https://github.com/stackabletech/docker-images/pull/1091
91+
[#1093]: https://github.com/stackabletech/docker-images/pull/1093
8092
[#1094]: https://github.com/stackabletech/docker-images/pull/1094
93+
[#1097]: https://github.com/stackabletech/docker-images/pull/1097
94+
[#1098]: https://github.com/stackabletech/docker-images/pull/1098
8195

8296
## [25.3.0] - 2025-03-21
8397

‎airflow/Dockerfile‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ ARG STATSD_EXPORTER
2929
ARG PYTHON
3030
ARG TARGETARCH
3131
ARG STACKABLE_USER_UID
32+
ARG S3FS
33+
ARG CYCLONEDX_BOM
3234

3335
COPY airflow/constraints-${PRODUCT}-python${PYTHON}.txt /tmp/constraints.txt
3436
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
6870
pip install --no-cache-dir --upgrade pip
6971
pip install --no-cache-dir apache-airflow[${AIRFLOW_EXTRAS}]==${PRODUCT} --constraint /tmp/constraints.txt
7072
# Needed for pandas S3 integration to e.g. write and read csv and parquet files to/from S3
71-
pip install --no-cache-dir s3fs==2024.9.0 cyclonedx-bom==5.0.0
73+
pip install --no-cache-dir s3fs==${S3FS} cyclonedx-bom==${CYCLONEDX_BOM}
7274
# Needed for OIDC
7375
pip install --no-cache-dir Flask_OIDC==2.2.0 Flask-OpenID==1.3.1
7476

‎airflow/versions.py‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,20 @@
33
"product": "2.9.3",
44
"python": "3.9",
55
"git_sync": "v4.4.0",
6+
"s3fs": "2024.9.0",
7+
"cyclonedx_bom": "6.0.0",
68
"statsd_exporter": "0.28.0",
79
"tini": "0.19.0",
8-
"vector": "0.43.1",
10+
"vector": "0.46.1",
911
},
1012
{
1113
"product": "2.10.4",
1214
"python": "3.12",
1315
"git_sync": "v4.4.0",
16+
"s3fs": "2024.9.0",
17+
"cyclonedx_bom": "6.0.0",
1418
"statsd_exporter": "0.28.0",
1519
"tini": "0.19.0",
16-
"vector": "0.43.1",
20+
"vector": "0.46.1",
1721
},
1822
]

‎hadoop/versions.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"java-base": "11",
55
"java-devel": "11",
66
"async_profiler": "2.9",
7-
"jmx_exporter": "1.1.0",
7+
"jmx_exporter": "1.2.0",
88
"protobuf": "3.7.1",
99
"hdfs_utils": "0.4.0",
1010
},
@@ -13,7 +13,7 @@
1313
"java-base": "11",
1414
"java-devel": "11",
1515
"async_profiler": "2.9",
16-
"jmx_exporter": "1.1.0",
16+
"jmx_exporter": "1.2.0",
1717
"protobuf": "3.7.1",
1818
"hdfs_utils": "0.4.0",
1919
},
@@ -22,7 +22,7 @@
2222
"java-base": "11",
2323
"java-devel": "11",
2424
"async_profiler": "2.9",
25-
"jmx_exporter": "1.1.0",
25+
"jmx_exporter": "1.2.0",
2626
"protobuf": "3.7.1",
2727
"hdfs_utils": "0.4.0",
2828
},
@@ -31,7 +31,7 @@
3131
"java-base": "11",
3232
"java-devel": "11",
3333
"async_profiler": "2.9",
34-
"jmx_exporter": "1.1.0",
34+
"jmx_exporter": "1.2.0",
3535
"protobuf": "3.7.1",
3636
"hdfs_utils": "0.4.1",
3737
},

‎hbase/versions.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
"phoenix": "5.2.1",
1212
"hbase_profile": "2.4",
1313
"hadoop": "3.3.6",
14-
"jmx_exporter": "1.1.0", # update the stackable/jmx/config<version> folder too
14+
"jmx_exporter": "1.2.0", # update the stackable/jmx/config<version> folder too
1515
"opa_authorizer": "", # only for HBase 2.6.1
1616
"delete_caches": "true",
1717
},

‎hive/versions.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
versions = [
22
{
33
"product": "3.1.3",
4-
"jmx_exporter": "1.1.0",
4+
"jmx_exporter": "1.2.0",
55
# Hive 3 must be built with Java 8 but will run on Java 11
66
"java-base": "11",
77
"java-devel": "8",
@@ -13,7 +13,7 @@
1313
},
1414
{
1515
"product": "4.0.0",
16-
"jmx_exporter": "1.1.0",
16+
"jmx_exporter": "1.2.0",
1717
# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
1818
"java-base": "11",
1919
"java-devel": "8",
@@ -25,7 +25,7 @@
2525
},
2626
{
2727
"product": "4.0.1",
28-
"jmx_exporter": "1.1.0",
28+
"jmx_exporter": "1.2.0",
2929
# Hive 4 must be built with Java 8 (according to GitHub README) but seems to run on Java 11
3030
"java-base": "11",
3131
"java-devel": "8",

‎java-base/versions.py‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,30 @@
11
versions = [
22
{
33
"product": "8",
4-
"vector": "0.43.1",
4+
"vector": "0.46.1",
55
},
66
{
77
"product": "11",
8-
"vector": "0.43.1",
8+
"vector": "0.46.1",
99
},
1010
{
1111
"product": "17",
12-
"vector": "0.43.1",
12+
"vector": "0.46.1",
1313
},
1414
{
1515
"product": "21",
16-
"vector": "0.43.1",
16+
"vector": "0.46.1",
1717
},
1818
{
1919
"product": "22",
20-
"vector": "0.43.1",
20+
"vector": "0.46.1",
2121
},
2222
{
2323
"product": "23",
24+
"vector": "0.46.1",
25+
},
26+
{
27+
"product": "24",
2428
"vector": "0.43.1",
2529
},
2630
]

‎java-devel/versions.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,8 @@
2323
"product": "23",
2424
"stackable-devel": "1.0.0",
2525
},
26+
{
27+
"product": "24",
28+
"stackable-devel": "1.0.0",
29+
},
2630
]

0 commit comments

Comments
 (0)