Skip to content

Commit 1475a8e

Browse files
committed
chore: Merge branch 'main' into feat/boil-image-size
2 parents 50a66d7 + 5751a31 commit 1475a8e

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ All notable changes to this project will be documented in this file.
2929
This uses a git mirror and patchable instead of sourcing from Nexus.
3030
- superset: Bump statsd_exporter to `0.30.0` ([#1524]).
3131
- hadoop: Refactor cloud library provisioning to downstream images. The jars are now conveniently placed in `/stackable/hadoop-cloud-libraries/` to be easily picked up ([#1511]).
32+
- spark: bump hadoop `3.4.2` to `3.4.3` ([#1533])
3233

3334
### Fixed
3435

@@ -68,8 +69,9 @@ All notable changes to this project will be documented in this file.
6869
[#1519]: https://github.com/stackabletech/docker-images/pull/1519
6970
[#1520]: https://github.com/stackabletech/docker-images/pull/1520
7071
[#1521]: https://github.com/stackabletech/docker-images/pull/1521
71-
[#1525]: https://github.com/stackabletech/docker-images/pull/1525
7272
[#1524]: https://github.com/stackabletech/docker-images/pull/1524
73+
[#1525]: https://github.com/stackabletech/docker-images/pull/1525
74+
[#1533]: https://github.com/stackabletech/docker-images/pull/1533
7375

7476
## [26.3.0] - 2026-03-16
7577

hadoop/hadoop/Dockerfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ARG PROTOBUF_VERSION
1010
ARG AWS_JAVA_SDK_BUNDLE_VERSION
1111
ARG AZURE_STORAGE_VERSION
1212
ARG AZURE_KEYVAULT_CORE_VERSION
13+
ARG ANALYTICSACCELERATOR_S3_VERSION
1314
ARG STACKABLE_USER_UID
1415

1516
WORKDIR /stackable
@@ -166,6 +167,8 @@ else
166167
cp /stackable/hadoop/share/hadoop/common/lib/hadoop-aws-${NEW_VERSION}.jar /stackable/hadoop-cloud-libraries/
167168
# Starting with Hadoop 3.4.3 the aws-java-sdk-bundle is not included any more.
168169
curl -o /stackable/hadoop-cloud-libraries/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar --fail "https://repo.stackable.tech/repository/packages/aws/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE_VERSION}.jar"
170+
# Starting with Hadoop 3.4.3 the S3A InputStreamType factory references analyticsaccelerator-s3 (software.amazon.s3.analyticsaccelerator.request.ObjectClient) during S3AFileSystem.initialize.
171+
curl -o /stackable/hadoop-cloud-libraries/analyticsaccelerator-s3-${ANALYTICSACCELERATOR_S3_VERSION}.jar --fail "https://repo.stackable.tech/repository/packages/aws/analyticsaccelerator-s3-${ANALYTICSACCELERATOR_S3_VERSION}.jar"
169172
cp /stackable/hadoop/share/hadoop/common/lib/hadoop-azure-${NEW_VERSION}.jar /stackable/hadoop-cloud-libraries/
170173
cp /stackable/hadoop/share/hadoop/common/lib/azure-storage-${AZURE_STORAGE_VERSION}.jar /stackable/hadoop-cloud-libraries/
171174
cp /stackable/hadoop/share/hadoop/common/lib/azure-keyvault-core-${AZURE_KEYVAULT_CORE_VERSION}.jar /stackable/hadoop-cloud-libraries/

hadoop/hadoop/boil-config.toml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ protobuf-version = "3.21.12" # https://github.com/apache/hadoop/blob/rel/release
3030
aws-java-sdk-bundle-version = "2.35.4" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.3
3131
azure-storage-version = "7.0.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.3
3232
azure-keyvault-core-version = "1.0.0" # Needs to match https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
33+
analyticsaccelerator-s3-version = "1.3.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.3
3334

3435

3536

@@ -42,3 +43,4 @@ protobuf-version = "3.25.5" # https://github.com/apache/hadoop/blob/rel/release-
4243
aws-java-sdk-bundle-version = "2.35.4" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.5.0
4344
azure-storage-version = "7.0.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.5.0
4445
azure-keyvault-core-version = "1.0.0" # Needs to match https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
46+
analyticsaccelerator-s3-version = "1.3.1" # Needs to match https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.3

spark-k8s/boil-config.toml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
containerfile = "Dockerfile.3"
77

88
[versions."3.5.8".local-images]
9-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
9+
"hadoop/hadoop" = "3.4.3"
1010
java-base = "17"
1111
java-devel = "17"
1212
hbase = "2.6.3"
@@ -22,19 +22,20 @@ tini-version = "0.19.0"
2222
hbase-connector-version = "1.0.1_3.5.8"
2323

2424

25+
2526
# LTS since 26.7.0
2627
[versions."4.1.1"]
2728
containerfile = "Dockerfile.4"
2829

2930
[versions."4.1.1".local-images]
30-
"hadoop/hadoop" = "3.4.2" # TODO: Bump to 3.4.3
31+
"hadoop/hadoop" = "3.4.3"
3132
java-base = "21"
3233
java-devel = "21"
3334

3435
[versions."4.1.1".build-arguments]
3536
python-version = "3.12"
36-
jackson-dataformat-xml-version = "2.15.2" # Needs to match https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.12/3.5.7
37-
stax2-api-version = "4.2.1" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
38-
woodstox-core-version = "6.5.1" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
37+
jackson-dataformat-xml-version = "2.20.0" # Needs to match https://mvnrepository.com/artifact/org.apache.spark/spark-parent_2.13/4.1.1
38+
stax2-api-version = "4.2.2" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.20.0
39+
woodstox-core-version = "7.1.1" # Needs to match https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.20.0
3940
jmx-exporter-version = "1.3.0"
4041
tini-version = "0.19.0"

0 commit comments

Comments
 (0)