Merge branch 'main' into chore/spark/26.3/bump

Author: razvan

CHANGELOG.md

@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
 
 ### Added
 
+- airflow: Add 3.1.5 ([#1405]).
 - superset: Add 6.0.0 ([#1337], [#1393]).
 - opa: Add 1.12.2 ([#1396]).
 - hive: Build [hive-metastore-opa-authorizer](https://github.com/boschglobal/hive-metastore-opa-authorizer) from source and add to image ([#1340]).
@@ -18,6 +19,7 @@ All notable changes to this project will be documented in this file.
 - spark: Add `4.1.1` ([#1402]).
 - spark-connect-client: Add `4.1.1` ([#1402]).
 - spark-k8s/hbase-connectors: new image extracted from spark dockerfile ([#1402]).
+- trino: Add `479` ([#1403]).
 
 ### Changed
 
@@ -27,6 +29,7 @@ All notable changes to this project will be documented in this file.
 - hive: fixed 4.0.1 shaded hive-metastore-opa-authorizer jar by relocating dependencies ([#1356]).
 - testing-tools: fix: add kubectl and openssl ([#1367]).
 - trino: Backport Kafka offset handling to 477 ([#1373]).
+- trino-cli: Bump to `479` ([#1403]).
 - ubi: Bumped ubi9 and ubi10 hashes ([#1386]).
 - vector: Bumped from 0.49.0 to 0.52.0 ([#1387]).
 - spark: Use one Dockerfile per major product version ([#1402]).
@@ -35,6 +38,7 @@ All notable changes to this project will be documented in this file.
 
 ### Removed
 
+- airflow: Remove 2.10.5 and 3.0.1 ([#1405]).
 - opensearch: Remove the `performance-analyzer` plugin from the OpenSearch image ([#1357]).
 - superset: Remove 4.0.2 and 4.1.2 ([#1394]).
 - kafka: Remove `3.7.2` and `4.1.0` ([#1395]).
@@ -43,6 +47,7 @@ All notable changes to this project will be documented in this file.
 - spark-connect-client: Remove `3.5.6` ([#1402]).
 - opa: Remove `1.4.2` ([#1396]).
 - zookeeper: Remove `3.9.3` ([#1401]).
+- trino: Remove `451` and `476` ([#1403]).
 
 ### Fixed
 
@@ -72,6 +77,8 @@ All notable changes to this project will be documented in this file.
 [#1396]: https://github.com/stackabletech/docker-images/pull/1396
 [#1401]: https://github.com/stackabletech/docker-images/pull/1401
 [#1402]: https://github.com/stackabletech/docker-images/pull/1402
+[#1403]: https://github.com/stackabletech/docker-images/pull/1403
+[#1405]: https://github.com/stackabletech/docker-images/pull/1405
 
 ## [25.11.0] - 2025-11-07
 

airflow/Dockerfile

@@ -168,7 +168,11 @@ uv pip install --no-cache-dir /tmp/opa_auth_manager-0.1.0-py3-none-any.whl
 
 # Create the SBOM for Airflow
 # Important: All `pip install` commands must be above this line, otherwise the SBOM will be incomplete
-cyclonedx-py environment --schema-version 1.5 --outfile /tmp/sbom.json
+if [ "$PRODUCT_VERSION" == "3.1.5" ]; then
+  cyclonedx-py environment --spec-version 1.5 --output-file /tmp/sbom.json
+else
+  cyclonedx-py environment --schema-version 1.5 --outfile /tmp/sbom.json
+fi
 uv pip uninstall cyclonedx-bom
 
 # Break circular dependencies by removing the apache-airflow dependency from the providers

airflow/boil-config.toml

@@ -1,3 +1,4 @@
+# Deprecated since SDP 25.11
 [versions."2.9.3".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.52.0"
@@ -14,69 +15,76 @@ airflow-extras-other = "async,amazon,celery,cncf.kubernetes,docker,dask,elastics
 opa-auth-manager = "airflow-2"
 nodejs-version = "20"
 
-[versions."2.10.5".local-images]
+# LTS
+[versions."3.0.6".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.52.0"
 stackable-devel = "1.0.0"
 
-[versions."2.10.5".build-arguments]
+[versions."3.0.6".build-arguments]
 python-version = "3.12"
 git-sync-version = "v4.4.1"
 s3fs-version = "2024.9.0"
 cyclonedx-bom-version = "6.0.0"
 tini-version = "0.19.0"
 uv-version = "0.7.8"
-airflow-extras-other = "async,amazon,celery,cncf.kubernetes,docker,dask,elasticsearch,ftp,grpc,hashicorp,http,ldap,google,google_auth,microsoft.azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,virtualenv,trino"
-opa-auth-manager = "airflow-2"
-nodejs-version = "20"
 
-[versions."3.0.1".local-images]
-"shared/statsd-exporter" = "0.28.0"
-vector = "0.52.0"
-stackable-devel = "1.0.0"
+# Airflow extras are defined in separate lists to make them easier to check against the links below. The lists will be concatenated and duplicates removed in the dockerfile.
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#core-airflow-extras
+airflow-extras-core = "async,graphviz,kerberos,otel,sentry,standard,statsd"
+
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#meta-airflow-package-extras
+airflow-extras-meta = "aiobotocore,cloudpickle,github-enterprise,google-auth,graphviz,ldap,leveldb,pandas,polars,rabbitmq,s3fs,saml,uv"
+
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#apache-software-extras
+airflow-extras-provider-apache = "apache-beam,apache-cassandra,apache-drill,apache-druid,apache-flink,apache-hdfs,apache-hive,apache-iceberg,apache-impala,apache-kafka,apache-kylin,apache-livy,apache-pig,apache-pinot"
+
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#external-services-extras
+airflow-extras-external-services = "airbyte,alibaba,apprise,amazon,asana,atlassian-jira,microsoft-azure,cloudant,cohere,databricks,datadog,dbt-cloud,dingding,discord,facebook,github,google,hashicorp,openai,opsgenie,pagerduty,pgvector,pinecone,qdrant,salesforce,sendgrid,segment,slack,snowflake,tableau,tabular,telegram,vertica,weaviate,yandex,ydb,zendesk"
+
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#locally-installed-software-extras
+airflow-extras-locally-installed-software = "arangodb,celery,cncf-kubernetes,docker,edge3,elasticsearch,exasol,fab,git,github,influxdb,jenkins,mongo,microsoft-mssql,neo4j,odbc,openfaas,oracle,postgres,presto,redis,samba,singularity,teradata,trino"
+
+# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#other-extras
+airflow-extras-other = "common-compat,common-io,common-messaging,common-sql,ftp,grpc,http,imap,jdbc,microsoft-psrp,microsoft-winrm,openlineage,opensearch,papermill,sftp,smtp,sqlite,ssh"
 
-[versions."3.0.1".build-arguments]
-python-version = "3.12"
-git-sync-version = "v4.4.1"
-s3fs-version = "2024.9.0"
-cyclonedx-bom-version = "6.0.0"
-tini-version = "0.19.0"
-uv-version = "0.7.8"
-airflow-extras-other = "async,amazon,celery,cncf-kubernetes,docker,elasticsearch,fab,ftp,grpc,hashicorp,http,ldap,google,microsoft-azure,odbc,pandas,postgres,redis,sendgrid,sftp,slack,ssh,statsd,trino"
 opa-auth-manager = "airflow-3"
 nodejs-version = "20"
 
-[versions."3.0.6".local-images]
+# Supported
+[versions."3.1.5".local-images]
 "shared/statsd-exporter" = "0.28.0"
 vector = "0.52.0"
 stackable-devel = "1.0.0"
 
-[versions."3.0.6".build-arguments]
+[versions."3.1.5".build-arguments]
+# NOTE (@Techassi): Maybe this version can be bumped
 python-version = "3.12"
-git-sync-version = "v4.4.1"
-s3fs-version = "2024.9.0"
-cyclonedx-bom-version = "6.0.0"
+git-sync-version = "v4.5.1"
+s3fs-version = "2026.1.0"
+cyclonedx-bom-version = "7.2.1"
 tini-version = "0.19.0"
-uv-version = "0.7.8"
+# NOTE (@Techassi): Maybe this version can be bumped
+uv-version = "0.7.22"
 
 # Airflow extras are defined in separate lists to make them easier to check against the links below. The lists will be concatenated and duplicates removed in the dockerfile.
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#core-airflow-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#core-airflow-extras
 airflow-extras-core = "async,graphviz,kerberos,otel,sentry,standard,statsd"
 
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#meta-airflow-package-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#meta-airflow-package-extras
 airflow-extras-meta = "aiobotocore,cloudpickle,github-enterprise,google-auth,graphviz,ldap,leveldb,pandas,polars,rabbitmq,s3fs,saml,uv"
 
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#apache-software-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#apache-software-extras
 airflow-extras-provider-apache = "apache-beam,apache-cassandra,apache-drill,apache-druid,apache-flink,apache-hdfs,apache-hive,apache-iceberg,apache-impala,apache-kafka,apache-kylin,apache-livy,apache-pig,apache-pinot"
 
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#external-services-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#external-services-extras
 airflow-extras-external-services = "airbyte,alibaba,apprise,amazon,asana,atlassian-jira,microsoft-azure,cloudant,cohere,databricks,datadog,dbt-cloud,dingding,discord,facebook,github,google,hashicorp,openai,opsgenie,pagerduty,pgvector,pinecone,qdrant,salesforce,sendgrid,segment,slack,snowflake,tableau,tabular,telegram,vertica,weaviate,yandex,ydb,zendesk"
 
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#locally-installed-software-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#locally-installed-software-extras
 airflow-extras-locally-installed-software = "arangodb,celery,cncf-kubernetes,docker,edge3,elasticsearch,exasol,fab,git,github,influxdb,jenkins,mongo,microsoft-mssql,neo4j,odbc,openfaas,oracle,postgres,presto,redis,samba,singularity,teradata,trino"
 
-# See https://airflow.apache.org/docs/apache-airflow/3.0.6/extra-packages-ref.html#other-extras
+# See https://airflow.apache.org/docs/apache-airflow/3.1.5/extra-packages-ref.html#other-extras
 airflow-extras-other = "common-compat,common-io,common-messaging,common-sql,ftp,grpc,http,imap,jdbc,microsoft-psrp,microsoft-winrm,openlineage,opensearch,papermill,sftp,smtp,sqlite,ssh"
 
 opa-auth-manager = "airflow-3"
-nodejs-version = "20"
+nodejs-version = "22"