From a28ba537fd7757be0a6de8cc9b4f8986f3b457f7 Mon Sep 17 00:00:00 2001
From: Sebastian Bernauer <sebastian.bernauer@stackable.tech>
Date: Mon, 9 Nov 2026 13:15:04 +0100
Subject: [PATCH] test: Use SDP support to configure Iceberg REST catalog in
 TrinoCatalog

---
 .../kuttl/iceberg-hive/34_trino.yaml.j2       |  2 +-
 .../kuttl/iceberg-rest/31_trino.yaml.j2       | 29 +++++++++++++------
 2 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/tests/templates/kuttl/iceberg-hive/34_trino.yaml.j2 b/tests/templates/kuttl/iceberg-hive/34_trino.yaml.j2
index d6ccea82..395687c1 100644
--- a/tests/templates/kuttl/iceberg-hive/34_trino.yaml.j2
+++ b/tests/templates/kuttl/iceberg-hive/34_trino.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: trino.stackable.tech/v1alpha1
+apiVersion: trino.stackable.tech/v1alpha2
 kind: TrinoCatalog
 metadata:
   name: iceberg
diff --git a/tests/templates/kuttl/iceberg-rest/31_trino.yaml.j2 b/tests/templates/kuttl/iceberg-rest/31_trino.yaml.j2
index 04f9568f..499dcc97 100644
--- a/tests/templates/kuttl/iceberg-rest/31_trino.yaml.j2
+++ b/tests/templates/kuttl/iceberg-rest/31_trino.yaml.j2
@@ -1,5 +1,5 @@
 ---
-apiVersion: trino.stackable.tech/v1alpha1
+apiVersion: trino.stackable.tech/v1alpha2
 kind: TrinoCatalog
 metadata:
   name: lakehouse
@@ -8,16 +8,27 @@ metadata:
 spec:
   connector:
     iceberg:
+      catalog:
+        rest:
+          hostname: hive-metastore-default-headless
+          port: 9001
+          tls: null
+          path: /iceberg
+          authentication:
+            oAuth2:
+              server:
+                hostname: keycloak.$NAMESPACE.svc.cluster.local
+                port: 8443
+                path: /realms/test/protocol/openid-connect/token
+                tls:
+                  verification:
+                    server:
+                      caCert:
+                        secretClass: tls
+              clientCredentials:
+                secretName: trino-client-credentials
       s3:
         reference: garage
-  configOverrides:
-    iceberg.catalog.type: rest
-    # We are using the headless service, as the hive-metastore service is missing port 9001
-    iceberg.rest-catalog.uri: http://hive-metastore-default-headless:9001/iceberg
-    iceberg.rest-catalog.security: OAUTH2
-    iceberg.rest-catalog.oauth2.server-uri: https://keycloak.$NAMESPACE.svc.cluster.local:8443/realms/test/protocol/openid-connect/token
-    # TODO Mount as env var from Secret trino-client-credentials
-    iceberg.rest-catalog.oauth2.credential: trino:trino-secret
 ---
 apiVersion: trino.stackable.tech/v1alpha1
 kind: TrinoCluster