stackabletech · NickLarsenNZ · Mar 11, 2025 · Feb 5, 2025 · Feb 5, 2025 · Feb 5, 2025
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,18 +11,21 @@ All notable changes to this project will be documented in this file.
 - Run a `containerdebug` process in the background of each Trino container to collect debugging information ([#687]).
 - Support configuring JVM arguments ([#677]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#677]).
+- Support for Trino 469 ([#705]).
 
 ## Changed
 
 - Increased the default temporary secret lifetime for coordinators from 1 day to 15 days.
   This is because Trino currently does not offer a HA setup for them, a restart kills all running queries ([#694]).
 - Default to OCI for image metadata and product image selection ([#695]).
+- Set `fs.hadoop.enabled=true` catalog config property to enable Legacy S3 support ([#705]).
 
 [#676]: https://github.com/stackabletech/trino-operator/pull/676
 [#677]: https://github.com/stackabletech/trino-operator/pull/677
 [#687]: https://github.com/stackabletech/trino-operator/pull/687
 [#694]: https://github.com/stackabletech/trino-operator/pull/694
 [#695]: https://github.com/stackabletech/trino-operator/pull/695
+[#705]: https://github.com/stackabletech/trino-operator/pull/705
 
 ## [24.11.1] - 2025-01-10
 

diff --git a/Cargo.nix b/Cargo.nix
diff --git a/docs/modules/trino/examples/getting_started/code/trino.yaml b/docs/modules/trino/examples/getting_started/code/trino.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/docs/modules/trino/examples/getting_started/code/trino.yaml.j2 b/docs/modules/trino/examples/getting_started/code/trino.yaml.j2
@@ -5,7 +5,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/docs/modules/trino/examples/usage-guide/trino-insecure.yaml b/docs/modules/trino/examples/usage-guide/trino-insecure.yaml
@@ -17,7 +17,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-internal-tls.yaml
@@ -17,7 +17,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     tls:
       internalSecretClass: trino-internal-tls # <1>

diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-tls-only.yaml
@@ -17,7 +17,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     tls:
       serverSecretClass: trino-tls # <1>

diff --git a/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml b/docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml
@@ -17,7 +17,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     tls:
       serverSecretClass: trino-tls # <1>

diff --git a/docs/modules/trino/pages/usage-guide/catalogs/index.adoc b/docs/modules/trino/pages/usage-guide/catalogs/index.adoc
@@ -73,7 +73,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/docs/modules/trino/partials/supported-versions.adoc b/docs/modules/trino/partials/supported-versions.adoc
@@ -2,5 +2,6 @@
 // This is a separate file, since it is used by both the direct Trino documentation, and the overarching
 // Stackable Platform documentation.
 
+- 469
 - 455
 - 451 (LTS)
diff --git a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     authentication:
       - authenticationClass: simple-trino-users

diff --git a/examples/simple-trino-cluster-hive-ha-s3.yaml b/examples/simple-trino-cluster-hive-ha-s3.yaml
@@ -9,7 +9,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/examples/simple-trino-cluster-resource-limits.yaml b/examples/simple-trino-cluster-resource-limits.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector: {}
   coordinators:

diff --git a/examples/simple-trino-cluster-s3.yaml b/examples/simple-trino-cluster-s3.yaml
@@ -7,7 +7,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/examples/simple-trino-cluster.yaml b/examples/simple-trino-cluster.yaml
@@ -5,7 +5,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     catalogLabelSelector:
       matchLabels:

diff --git a/examples/simple-trino-oauth2.yaml b/examples/simple-trino-oauth2.yaml
@@ -91,7 +91,7 @@ metadata:
   name: simple-trino
 spec:
   image:
-    productVersion: "455"
+    productVersion: "469"
   clusterConfig:
     authentication:
       - authenticationClass: simple-trino-oidc

diff --git a/rust/crd/src/affinity.rs b/rust/crd/src/affinity.rs
@@ -112,7 +112,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector:
               matchLabels:
@@ -199,7 +199,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector:
               matchLabels:

diff --git a/rust/crd/src/lib.rs b/rust/crd/src/lib.rs
@@ -897,7 +897,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
         "#;
@@ -912,7 +912,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
             tls:
@@ -929,7 +929,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
             tls:
@@ -947,7 +947,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
             tls:
@@ -967,7 +967,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
         "#;
@@ -982,7 +982,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
             tls:
@@ -999,7 +999,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
             tls:
@@ -1020,7 +1020,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
         "#;
@@ -1040,7 +1040,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
           workers:
@@ -1066,7 +1066,7 @@ mod tests {
           name: simple-trino
         spec:
           image:
-            productVersion: "455"
+            productVersion: "469"
           clusterConfig:
             catalogLabelSelector: {}
           workers:

diff --git a/rust/operator-binary/src/catalog/black_hole.rs b/rust/operator-binary/src/catalog/black_hole.rs
@@ -13,6 +13,7 @@ impl ToCatalogConfig for BlackHoleConnector {
         catalog_name: &str,
         _catalog_namespace: Option<String>,
         _client: &Client,
+        _trino_version: u16,
     ) -> Result<CatalogConfig, FromTrinoCatalogError> {
         // No additional properties needed
         Ok(CatalogConfig::new(catalog_name.to_string(), CONNECTOR_NAME))

diff --git a/rust/operator-binary/src/catalog/commons.rs b/rust/operator-binary/src/catalog/commons.rs
@@ -19,7 +19,7 @@ use super::{
     from_trino_catalog_error::{
         ConfigureS3Snafu, FailedToGetDiscoveryConfigMapDataKeySnafu,
         FailedToGetDiscoveryConfigMapDataSnafu, FailedToGetDiscoveryConfigMapSnafu,
-        ObjectHasNoNamespaceSnafu, S3TlsNoVerificationNotSupportedSnafu,
+        ObjectHasNoNamespaceSnafu, S3TlsNoVerificationNotSupportedSnafu, S3TlsRequiredSnafu,
     },
     ExtendCatalogConfig, FromTrinoCatalogError,
 };
@@ -33,6 +33,7 @@ impl ExtendCatalogConfig for MetastoreConnection {
         catalog_name: &str,
         catalog_namespace: Option<String>,
         client: &Client,
+        _trino_version: u16,
     ) -> Result<(), FromTrinoCatalogError> {
         let hive_cm: ConfigMap = client
             .get(
@@ -79,6 +80,7 @@ impl ExtendCatalogConfig for S3ConnectionInlineOrReference {
         catalog_name: &str,
         catalog_namespace: Option<String>,
         client: &Client,
+        trino_version: u16,
     ) -> Result<(), FromTrinoCatalogError> {
         let s3 = self
             .clone()
@@ -91,22 +93,50 @@ impl ExtendCatalogConfig for S3ConnectionInlineOrReference {
             .await
             .context(ConfigureS3Snafu)?;
 
-        catalog_config.add_property("hive.s3.endpoint", s3.endpoint().context(ConfigureS3Snafu)?);
-        catalog_config.add_property(
-            "hive.s3.path-style-access",
-            (s3.access_style == S3AccessStyle::Path).to_string(),
-        );
-
         let (volumes, mounts) = s3.volumes_and_mounts().context(ConfigureS3Snafu)?;
         catalog_config.volumes.extend(volumes);
         catalog_config.volume_mounts.extend(mounts);
 
+        if trino_version >= 469 {
+            // Trino 469 deprecates the Legacy S3 (via the Hadoop FS interface) implementation.
+            // Trino 470 completely removes Legacy S3 support.
+            catalog_config.add_property("fs.native-s3.enabled", "true");
+        }
+
+        let (endpoint_prop, path_style_prop) = match trino_version {
+            ..=468 => ("hive.s3.endpoint", "hive.s3.path-style-access"),
+            469.. => ("s3.endpoint", "s3.path-style-access"),
+        };
+        catalog_config.add_property(endpoint_prop, s3.endpoint().context(ConfigureS3Snafu)?);
+        catalog_config.add_property(
+            path_style_prop,
+            (s3.access_style == S3AccessStyle::Path).to_string(),
+        );
+
         if let Some((access_key, secret_key)) = s3.credentials_mount_paths() {
-            catalog_config.add_env_property_from_file("hive.s3.aws-access-key", access_key);
-            catalog_config.add_env_property_from_file("hive.s3.aws-secret-key", secret_key);
+            let (access_key_prop, secret_key_prop) = match trino_version {
+                ..=468 => ("hive.s3.aws-access-key", "hive.s3.aws-secret-key"),
+                469.. => ("s3.aws-access-key", "s3.aws-secret-key"),
+            };
+            catalog_config.add_env_property_from_file(access_key_prop, access_key);
+            catalog_config.add_env_property_from_file(secret_key_prop, secret_key);
         }
 
-        catalog_config.add_property("hive.s3.ssl.enabled", s3.tls.uses_tls().to_string());
+        match trino_version {
+            // Older trino versions allowed TLS to be optional
+            ..=468 => {
+                // TODO (@NickLarsenNZ): Should we warn that TLS verification is required in future versions of Trino?
+                catalog_config.add_property("hive.s3.ssl.enabled", s3.tls.uses_tls().to_string());
+            }
+            // TLS is required when using native S3 implementation.
+            // https://trino.io/docs/469/object-storage/legacy-s3.html#migration-to-s3-file-system
+            469.. => {
+                if !s3.tls.uses_tls() {
+                    return S3TlsRequiredSnafu.fail();
+                }
+            }
+        };
+
         if let Some(tls) = s3.tls.tls.as_ref() {
             match &tls.verification {
                 TlsVerification::None {} => return S3TlsNoVerificationNotSupportedSnafu.fail(),
@@ -141,6 +171,7 @@ impl ExtendCatalogConfig for HdfsConnection {
         catalog_name: &str,
         _catalog_namespace: Option<String>,
         _client: &Client,
+        _trino_version: u16,
     ) -> Result<(), FromTrinoCatalogError> {
         let hdfs_site_dir = format!("{CONFIG_DIR_NAME}/catalog/{catalog_name}/hdfs-config");
         catalog_config.add_property(