From b6a4f015dc8d1917165fa8273300f01db3de56d1 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 15:06:12 +0200 Subject: [PATCH 1/7] docs: Update supported versions list --- docs/modules/trino/partials/supported-versions.adoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/modules/trino/partials/supported-versions.adoc b/docs/modules/trino/partials/supported-versions.adoc index e32237b1..3b9236b4 100644 --- a/docs/modules/trino/partials/supported-versions.adoc +++ b/docs/modules/trino/partials/supported-versions.adoc @@ -2,6 +2,6 @@ // This is a separate file, since it is used by both the direct Trino documentation, and the overarching // Stackable Platform documentation. -- 470 -- 455 (deprecated) +- 476 +- 470 (deprecated) - 451 (LTS) From 37b9e011a018efc21811d982d0e5234854cfe75e Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 15:32:10 +0200 Subject: [PATCH 2/7] chore: Add operator support for 476 (remove 455) --- rust/operator-binary/src/config/jvm.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rust/operator-binary/src/config/jvm.rs b/rust/operator-binary/src/config/jvm.rs index e10613ff..5420594c 100644 --- a/rust/operator-binary/src/config/jvm.rs +++ b/rust/operator-binary/src/config/jvm.rs @@ -129,9 +129,9 @@ fn recommended_trino_jvm_args(product_version: u16) -> Result, Error "-XX:G1NumCollectionsKeepPinned=10000000".to_owned(), ]), // Copied from: - // - https://trino.io/docs/455/installation/deployment.html#jvm-config // - https://trino.io/docs/470/installation/deployment.html#jvm-config - 455 | 470 => Ok(vec![ + // - https://trino.io/docs/476/installation/deployment.html#jvm-config + 470 | 476 => Ok(vec![ "-XX:InitialRAMPercentage=80".to_owned(), "-XX:MaxRAMPercentage=80".to_owned(), "-XX:G1HeapRegionSize=32M".to_owned(), From ad84a6200b8e51e2e8ceb73fe301e6642d2e90aa Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 16:48:07 +0200 Subject: [PATCH 3/7] test: Add 476, remove 455 --- tests/test-definition.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 9a86f260..6e94b0b8 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -20,13 +20,13 @@ dimensions: - name: trino values: - "451" - - "455" - "470" + - "476" # To use a custom image, add a comma and the full name after the product version # - 470,oci.stackable.tech/sdp/trino:470-stackable0.0.0-dev - name: trino-latest values: - - "470" + - "476" # To use a custom image, add a comma and the full name after the product version # - 470,oci.stackable.tech/sdp/trino:470-stackable0.0.0-dev - name: hive From 209e8295e9a5a76bce8fed19de14e7b2ccc851c5 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 16:49:10 +0200 Subject: [PATCH 4/7] docs: Replace 470 with 476 --- docs/modules/trino/examples/getting_started/code/trino.yaml | 2 +- docs/modules/trino/examples/usage-guide/trino-insecure.yaml | 2 +- .../trino/examples/usage-guide/trino-secure-internal-tls.yaml | 2 +- .../trino/examples/usage-guide/trino-secure-tls-only.yaml | 2 +- docs/modules/trino/examples/usage-guide/trino-secure-tls.yaml | 2 +- ...imple-trino-cluster-authentication-opa-authorization-s3.yaml | 2 +- examples/simple-trino-cluster-hive-ha-s3.yaml | 2 +- examples/simple-trino-cluster-resource-limits.yaml | 2 +- examples/simple-trino-cluster-s3.yaml | 2 +- examples/simple-trino-cluster.yaml | 2 +- examples/simple-trino-oauth2.yaml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/docs/modules/trino/examples/getting_started/code/trino.yaml b/docs/modules/trino/examples/getting_started/code/trino.yaml index d187bf61..26a0ca1d 100644 --- 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: "470" + productVersion: "476" 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 index e5bf9241..2db400a2 100644 --- 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: "470" + productVersion: "476" 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 index a5373192..00b5ce94 100644 --- 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: "470" + productVersion: "476" 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 index d52b423e..7f053008 100644 --- 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: "470" + productVersion: "476" 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 index 1544dfaa..5f923474 100644 --- 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: "470" + productVersion: "476" clusterConfig: tls: serverSecretClass: trino-tls # <1> diff --git a/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml b/examples/simple-trino-cluster-authentication-opa-authorization-s3.yaml index da351816..5ef440a3 100644 --- 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: "470" + productVersion: "476" 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 index d846ead7..233acbb1 100644 --- 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: "470" + productVersion: "476" clusterConfig: catalogLabelSelector: matchLabels: diff --git a/examples/simple-trino-cluster-resource-limits.yaml b/examples/simple-trino-cluster-resource-limits.yaml index 7aab0243..0128a30f 100644 --- 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: "470" + productVersion: "476" clusterConfig: catalogLabelSelector: {} coordinators: diff --git a/examples/simple-trino-cluster-s3.yaml b/examples/simple-trino-cluster-s3.yaml index 4fdcc298..22ffe530 100644 --- 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: "470" + productVersion: "476" clusterConfig: catalogLabelSelector: matchLabels: diff --git a/examples/simple-trino-cluster.yaml b/examples/simple-trino-cluster.yaml index 2249836d..c8eaaf55 100644 --- a/examples/simple-trino-cluster.yaml +++ b/examples/simple-trino-cluster.yaml @@ -5,7 +5,7 @@ metadata: name: simple-trino spec: image: - productVersion: "470" + productVersion: "476" clusterConfig: catalogLabelSelector: matchLabels: diff --git a/examples/simple-trino-oauth2.yaml b/examples/simple-trino-oauth2.yaml index edac28e7..74256776 100644 --- a/examples/simple-trino-oauth2.yaml +++ b/examples/simple-trino-oauth2.yaml @@ -91,7 +91,7 @@ metadata: name: simple-trino spec: image: - productVersion: "470" + productVersion: "476" clusterConfig: authentication: - authenticationClass: simple-trino-oidc From 0426a753fef039a837b227f6b0a33d31a9cea022 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Tue, 10 Jun 2025 17:02:27 +0200 Subject: [PATCH 5/7] chore: Update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d4e6d40..4324b90f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - Use `--file-log-max-files` (or `FILE_LOG_MAX_FILES`) to limit the number of log files kept. - Use `--file-log-rotation-period` (or `FILE_LOG_ROTATION_PERIOD`) to configure the frequency of rotation. - Use `--console-log-format` (or `CONSOLE_LOG_FORMAT`) to set the format to `plain` (default) or `json`. +- Add support for Trino 476 ([#755]). ### Changed @@ -29,12 +30,17 @@ All notable changes to this project will be documented in this file. - The `runAsUser` and `runAsGroup` fields will not be set anymore by the operator - The defaults from the docker images itself will now apply, which will be different from 1000/0 going forward - This is marked as breaking because tools and policies might exist, which require these fields to be set +- Deprecate Trino 470 ([#755]). ### Fixed - Use `json` file extension for log files ([#733]). - Fix a bug where changes to ConfigMaps that are referenced in the TrinoCluster spec didn't trigger a reconciliation ([#734]). +### Removed + +- Remove support for Trino 455 ([#755]). + [#728]: https://github.com/stackabletech/trino-operator/pull/728 [#734]: https://github.com/stackabletech/trino-operator/pull/734 [#733]: https://github.com/stackabletech/trino-operator/pull/733 @@ -45,6 +51,7 @@ All notable changes to this project will be documented in this file. [#745]: https://github.com/stackabletech/trino-operator/pull/745 [#748]: https://github.com/stackabletech/trino-operator/pull/748 [#752]: https://github.com/stackabletech/trino-operator/pull/752 +[#755]: https://github.com/stackabletech/trino-operator/pull/755 ## [25.3.0] - 2025-03-21 From b8b6e7844dbb0a4bcdd5a50363e40bb58090bf63 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Wed, 11 Jun 2025 08:48:28 +0200 Subject: [PATCH 6/7] test: Flip condition that checks output --- tests/templates/kuttl/opa-authorization/check-opa.py.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/templates/kuttl/opa-authorization/check-opa.py.j2 b/tests/templates/kuttl/opa-authorization/check-opa.py.j2 index bafd398e..a29cc423 100755 --- a/tests/templates/kuttl/opa-authorization/check-opa.py.j2 +++ b/tests/templates/kuttl/opa-authorization/check-opa.py.j2 @@ -51,10 +51,10 @@ TEST_DATA = [ { "query": "SET SESSION iceberg.test=true", # The requests are authorized, just a fake property -{% if test_scenario['values']['trino'] == '470' %} - "error": "Session property iceberg.test does not exist", -{% else %} +{% if test_scenario['values']['trino'] == '451' %} "error": "Session property 'iceberg.test' does not exist", +{% else %} + "error": "Session property iceberg.test does not exist", {% endif %} }, # ## SCHEMA ## From b6ec3d184fb656dfaaee7966b65e5a23b56755f2 Mon Sep 17 00:00:00 2001 From: Nick Larsen Date: Thu, 12 Jun 2025 10:03:26 +0200 Subject: [PATCH 7/7] Revert "test: Flip condition that checks output" It turns out only Trino 470 has the different error output This reverts commit b8b6e7844dbb0a4bcdd5a50363e40bb58090bf63. --- tests/templates/kuttl/opa-authorization/check-opa.py.j2 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/templates/kuttl/opa-authorization/check-opa.py.j2 b/tests/templates/kuttl/opa-authorization/check-opa.py.j2 index a29cc423..bafd398e 100755 --- a/tests/templates/kuttl/opa-authorization/check-opa.py.j2 +++ b/tests/templates/kuttl/opa-authorization/check-opa.py.j2 @@ -51,10 +51,10 @@ TEST_DATA = [ { "query": "SET SESSION iceberg.test=true", # The requests are authorized, just a fake property -{% if test_scenario['values']['trino'] == '451' %} - "error": "Session property 'iceberg.test' does not exist", -{% else %} +{% if test_scenario['values']['trino'] == '470' %} "error": "Session property iceberg.test does not exist", +{% else %} + "error": "Session property 'iceberg.test' does not exist", {% endif %} }, # ## SCHEMA ##