Skip to content

Commit aaeba32

Browse files
committed
Merge branch 'main' into chore/hadoop-patch-bumps-25.11
2 parents 13dd3e3 + ac1abcc commit aaeba32

9 files changed

Lines changed: 100 additions & 7 deletions

File tree

.github/ISSUE_TEMPLATE/update-product-zookeeper.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,11 @@ Add/Change/Remove anything that isn't applicable anymore
2828
## Update tasks
2929

3030
- [ ] Update `boil-config.toml` to reflect the agreed upon versions in the spreadsheet (including the removal of old versions).
31-
- [ ] Upload new version (see `zookeeper/upload_new_zookeeper_version.sh`).
3231
- [ ] Update `boil-config.toml` to the latest supported version of JVM (base and devel).
3332
- [ ] Update other dependencies if applicable (eg: jmx_exporter, etc).
33+
- [ ] Initialize new product versions with patchable and add patches if applicable.
34+
- [ ] Delete old patch directories.
35+
- [ ] Check the corresponding operator (getting_started / kuttl / supported-versions) for usage of the versions.
3436
- [ ] Check other operators (getting_started / kuttl / supported-versions) for usage of the versions. Add the PR(s) to the list below.
3537
- [ ] Update the version in demos. Add the PR(s) to the list below.
3638

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#!/usr/bin/env bash
2+
3+
set -euo pipefail
4+
5+
VERSION=${1:?"Missing version number argument (arg 1)"}
6+
NEXUS_USER=${2:?"Missing Nexus username argument (arg 2)"}
7+
8+
read -r -s -p "Nexus Password: " NEXUS_PASSWORD
9+
echo ""
10+
11+
# https://stackoverflow.com/questions/4632028/how-to-create-a-temporary-directory
12+
# Find the directory name of the script
13+
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
14+
15+
# the temp directory used, within $DIR
16+
WORK_DIR=$(mktemp -d -p "$DIR")
17+
18+
# check if tmp dir was created
19+
if [[ ! "$WORK_DIR" || ! -d "$WORK_DIR" ]]; then
20+
echo "Could not create temp dir"
21+
exit 1
22+
fi
23+
24+
# deletes the temp directory
25+
function cleanup {
26+
rm -rf "$WORK_DIR"
27+
}
28+
29+
# register the cleanup function to be called on the EXIT signal
30+
trap cleanup EXIT
31+
32+
cd "$WORK_DIR" || exit
33+
34+
file=keycloak-$VERSION.tar.gz
35+
36+
echo "Downloading $file from github.com"
37+
curl --fail -LO --progress-bar "https://github.com/keycloak/keycloak/releases/download/$VERSION/$file"
38+
39+
echo "Uploading $file to Nexus"
40+
curl --fail -o /dev/null --progress-bar -u "$NEXUS_USER:$NEXUS_PASSWORD" \
41+
--upload-file "$file" \
42+
'https://repo.stackable.tech/repository/packages/keycloak/'
43+
44+
echo "Successfully uploaded new version $VERSION to Nexus"
45+
echo "https://repo.stackable.tech/service/rest/repository/browse/packages/keycloak/"

CHANGELOG.md

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ All notable changes to this project will be documented in this file.
2424
- spark: Add `4.0.1` ([#1286]).
2525
- spark-connect-client: Add `4.0.1` ([#1286]).
2626
- trino/trino-storage-connector: Add `477` ([#1285]).
27+
- testing-tools: Add `upload_new_keycloak_version.sh` script ([#1289]).
28+
- zookeeper: Add `3.9.4` ([#1292]).
2729

2830
### Changed
2931

@@ -34,10 +36,9 @@ All notable changes to this project will be documented in this file.
3436
- stackable-devel: Bump ubi9 base image and update cargo-auditable to `0.7.0` ([#1253]).
3537
- vector: Bump to `0.49.0` ([#1258]).
3638
- airflow: Bump uvicorn dependency to `0.37.0` ([#1264]).
37-
- druid: Deprecate `33.0.0` ([#1263]).
38-
- opa: Deprecate `1.4.2` ([#1279]).
3939
- trino-cli: Bump to 477 ([#1285]).
4040
- tools: Bump dependency versions - kubectl to `1.34.1`, yq to `4.47.2`, and jq to `1.8.1` ([#1290]).
41+
- testing-tools: Update keycloak dependency to `26.3.5` and `python:3.12-slim-bullseye` base image ([#1289]).
4142

4243
### Removed
4344

@@ -76,7 +77,9 @@ All notable changes to this project will be documented in this file.
7677
[#1284]: https://github.com/stackabletech/docker-images/pull/1284
7778
[#1285]: https://github.com/stackabletech/docker-images/pull/1285
7879
[#1286]: https://github.com/stackabletech/docker-images/pull/1286
80+
[#1289]: https://github.com/stackabletech/docker-images/pull/1289
7981
[#1290]: https://github.com/stackabletech/docker-images/pull/1290
82+
[#1292]: https://github.com/stackabletech/docker-images/pull/1292
8083

8184
## [25.7.0] - 2025-07-23
8285

testing-tools/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# https://hub.docker.com/_/python/tags
66
# In Docker Hub, open up the tag and look for Index Digest. Otherwise do:
77
# docker pull python:3.12-slim-bullseye and see the digest that appears in the output.
8-
FROM python:3.12-slim-bullseye@sha256:f6d639b794b394cbeb7a9327d5af9976f0e8d61353bcf41916984775c9bbed1a
8+
FROM python:3.12-slim-bullseye@sha256:411fa4dcfdce7e7a3057c45662beba9dcd4fa36b2e50a2bfcd6c9333e59bf0db
99

1010
ARG PRODUCT_VERSION
1111
ARG RELEASE_VERSION

testing-tools/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Stackable testing tools image
22

3-
* Based on debian/python 3.11 unlike `tools` which is based on UBI9 with python 3.9.
3+
* Based on debian/python 3.12 unlike `tools` which is based on UBI9 with python 3.9.
44
* Comes with Python packages needed by the kuttl tests.

testing-tools/boil-config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
[versions."0.2.0".build-arguments]
2-
keycloak-version = "23.0.0"
2+
keycloak-version = "26.3.5"

zookeeper/boil-config.toml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,11 @@ java-base = "17"
33
java-devel = "11"
44

55
[versions."3.9.3".build-arguments]
6-
jmx-exporter-version = "1.3.0"
6+
jmx-exporter-version = "1.4.0"
7+
8+
[versions."3.9.4".local-images]
9+
java-base = "17"
10+
java-devel = "11"
11+
12+
[versions."3.9.4".build-arguments]
13+
jmx-exporter-version = "1.4.0"
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
From 24644dd2f8463f972965d14021a7b071d8feaf81 Mon Sep 17 00:00:00 2001
2+
From: xeniape <xenia.fischer@stackable.tech>
3+
Date: Tue, 30 Sep 2025 15:24:05 +0200
4+
Subject: Add CycloneDX plugin
5+
6+
---
7+
pom.xml | 7 ++++++-
8+
1 file changed, 6 insertions(+), 1 deletion(-)
9+
10+
diff --git a/pom.xml b/pom.xml
11+
index 860ffb97..5355571a 100644
12+
--- a/pom.xml
13+
+++ b/pom.xml
14+
@@ -925,7 +925,7 @@
15+
<plugin>
16+
<groupId>org.cyclonedx</groupId>
17+
<artifactId>cyclonedx-maven-plugin</artifactId>
18+
- <version>2.7.9</version>
19+
+ <version>2.8.0</version>
20+
</plugin>
21+
</plugins>
22+
</pluginManagement>
23+
@@ -1200,6 +1200,11 @@
24+
<plugin>
25+
<groupId>org.cyclonedx</groupId>
26+
<artifactId>cyclonedx-maven-plugin</artifactId>
27+
+ <configuration>
28+
+ <projectType>application</projectType>
29+
+ <schemaVersion>1.5</schemaVersion>
30+
+ <skipNotDeployed>false</skipNotDeployed>
31+
+ </configuration>
32+
<executions>
33+
<execution>
34+
<goals>
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
mirror = "https://github.com/stackabletech/zookeeper.git"
2+
base = "7246445ec281f3dbf53dc54e970c914f39713903"

0 commit comments

Comments
 (0)