Skip to content

Commit b8ff8d3

Browse files
razvanNickLarsenNZ
andauthored
chore(spark): update container images for 25.7.0 (#1094)
* chore(spark): update container images for 25.7.0 * update changelog * remove 3.5.2 patches * explain the purpose of some args in versions.py * fix: aws artifact name and version * remove changelog entry --------- Co-authored-by: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
1 parent 6567adc commit b8ff8d3

File tree

5 files changed

+8
-65
lines changed

5 files changed

+8
-65
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ All notable changes to this project will be documented in this file.
5555
- yq: Bump products to use `4.45.2` ([#1090]).
5656
- cyclonedx-bom: Bump airflow and superset to use `6.0.0` ([#1090]).
5757
- vector: Bump to `0.46.1` ([#1098]).
58+
- spark: update dependencies for 3.5.5 ([#1094])
5859

5960
### Fixed
6061

@@ -80,6 +81,7 @@ All notable changes to this project will be documented in this file.
8081
Also remove the old release workflow.
8182
- zookeeper: Remove 3.9.2 ([#1093]).
8283
- Remove ubi8-rust-builder image ([#1091]).
84+
- spark: remove 3.5.2 ([#1094])
8385
- hadoop: Remove `3.3.4` and `3.4.0` ([#1099]).
8486
- opa: Remove `0.67.1` ([#1103]).
8587
- opa: Remove legacy bundle-builder from container build ([#1103]).
@@ -110,6 +112,7 @@ All notable changes to this project will be documented in this file.
110112
[#1090]: https://github.com/stackabletech/docker-images/pull/1090
111113
[#1091]: https://github.com/stackabletech/docker-images/pull/1091
112114
[#1093]: https://github.com/stackabletech/docker-images/pull/1093
115+
[#1094]: https://github.com/stackabletech/docker-images/pull/1094
113116
[#1097]: https://github.com/stackabletech/docker-images/pull/1097
114117
[#1098]: https://github.com/stackabletech/docker-images/pull/1098
115118
[#1099]: https://github.com/stackabletech/docker-images/pull/1099

spark-k8s/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ WORKDIR /stackable/spark-${PRODUCT}/dist/jars
155155
# Copy modules required for s3a://
156156
COPY --from=hadoop-builder --chown=${STACKABLE_USER_UID}:0 \
157157
/stackable/hadoop/share/hadoop/tools/lib/hadoop-aws-${HADOOP}.jar \
158-
/stackable/hadoop/share/hadoop/tools/lib/aws-java-sdk-bundle-${AWS_JAVA_SDK_BUNDLE}.jar \
158+
/stackable/hadoop/share/hadoop/tools/lib/bundle-${AWS_JAVA_SDK_BUNDLE}.jar \
159159
./
160160

161161
# Copy modules required for abfs://

spark-k8s/stackable/patches/3.5.2/0001-Update-CycloneDX-plugin.patch

-40
This file was deleted.

spark-k8s/stackable/patches/3.5.2/patchable.toml

-2
This file was deleted.

spark-k8s/versions.py

+4-22
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,13 @@
11
versions = [
2-
{
3-
"product": "3.5.2",
4-
"java-base": "17",
5-
"java-devel": "17",
6-
"python": "3.11",
7-
"hadoop": "3.3.6", # Hadoop version defined in ../hbase/versions.py to reduce build time and disk requirements
8-
"hbase": "2.6.1", # current Stackable LTS version
9-
"aws_java_sdk_bundle": "1.12.367", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
10-
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.6
11-
"azure_keyvault_core": "1.0.0", # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
12-
"jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.1
13-
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
14-
"woodstox_core": "6.5.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2
15-
"vector": "0.46.1",
16-
"jmx_exporter": "1.2.0",
17-
"tini": "0.19.0",
18-
"hbase_connector": "1.0.1",
19-
},
202
{
213
"product": "3.5.5",
224
"java-base": "17",
235
"java-devel": "17",
246
"python": "3.11",
25-
"hadoop": "3.3.6", # Hadoop version defined in ../hbase/versions.py to reduce build time and disk requirements
26-
"hbase": "2.6.1", # current Stackable LTS version
27-
"aws_java_sdk_bundle": "1.12.367", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.3.6
28-
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.3.6
7+
"hadoop": "3.4.1", # Current Stackable LTS version. Source of the AWS and Azure artifacts to Spark's classpath.
8+
"hbase": "2.6.2", # Current Stackable LTS version. Used to build the HBase connector.
9+
"aws_java_sdk_bundle": "2.24.6", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-aws/3.4.1
10+
"azure_storage": "7.0.1", # https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-azure/3.4.1
2911
"azure_keyvault_core": "1.0.0", # https://mvnrepository.com/artifact/com.microsoft.azure/azure-storage/7.0.1
3012
"jackson_dataformat_xml": "2.15.2", # https://mvnrepository.com/artifact/org.apache.spark/spark-core_2.13/3.5.2
3113
"stax2_api": "4.2.1", # https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-xml/2.15.2

0 commit comments

Comments
 (0)