chore: add oci references, merge templating changes (#695)

* replace docker references with oci

* bump op-rs to 0.85

* changelog

* revert test defs

---------

Co-authored-by: Xenia <xeniafischer@hotmail.de>

Author: adwk67

CHANGELOG.md

@@ -16,11 +16,13 @@ All notable changes to this project will be documented in this file.
 
 - 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]).
 
 [#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
 
 ## [24.11.1] - 2025-01-10
 

Cargo.lock

@@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0" }
 product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }

Cargo.nix

@@ -759,7 +759,7 @@ spec:
                     Consult the [Product image selection documentation](https://docs.stackable.tech/home/nightly/concepts/product_image_selection) for details.
                   properties:
                     custom:
-                      description: Overwrite the docker image. Specify the full docker image name, e.g. `docker.stackable.tech/stackable/superset:1.4.1-stackable2.1.0`
+                      description: Overwrite the docker image. Specify the full docker image name, e.g. `oci.stackable.tech/sdp/superset:1.4.1-stackable2.1.0`
                       type: string
                     productVersion:
                       description: Version of the product, e.g. `1.4.1`.
@@ -786,7 +786,7 @@ spec:
                       nullable: true
                       type: array
                     repo:
-                      description: Name of the docker repo, e.g. `docker.stackable.tech/stackable`
+                      description: Name of the docker repo, e.g. `oci.stackable.tech/sdp`
                       nullable: true
                       type: string
                     stackableVersion:

Cargo.toml

@@ -1,7 +1,7 @@
 # Default values for trino-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/trino-operator
+  repository: oci.stackable.tech/sdp/trino-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 

crate-hashes.json

@@ -30,7 +30,7 @@ docker run \
 --env KUBECONFIG=/home/stackable/.kube/config \
 --env KUBERNETES_CLUSTER_DOMAIN=mycluster.local \
 --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-docker.stackable.tech/stackable/trino-operator:latest
+oci.stackable.tech/sdp/trino-operator:0.0.0-dev
 ----
 
 == PRODUCT_CONFIG
@@ -56,7 +56,7 @@ docker run \
     --env KUBECONFIG=/home/stackable/.kube/config \
     --env PRODUCT_CONFIG=/my/product/config.yaml \
     --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-    docker.stackable.tech/stackable/trino-operator:latest
+    oci.stackable.tech/sdp/trino-operator:0.0.0-dev
 ----
 
 == WATCH_NAMESPACE
@@ -85,5 +85,5 @@ docker run \
 --env KUBECONFIG=/home/stackable/.kube/config \
 --env WATCH_NAMESPACE=test \
 --mount type=bind,source="$HOME/.kube/config",target="/home/stackable/.kube/config" \
-docker.stackable.tech/stackable/trino-operator:latest
+oci.stackable.tech/sdp/trino-operator:0.0.0-dev
 ----

deploy/helm/trino-operator/crds/crds.yaml

@@ -22,7 +22,7 @@ spec:
 {% endif %}
       containers:
         - name: test-trino
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
           command: ["sleep", "infinity"]
           volumeMounts:
             - name: tls

deploy/helm/trino-operator/values.yaml

@@ -18,6 +18,6 @@ spec:
       serviceAccount: integration-tests-sa
       containers:
         - name: trino-test-runner
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
           stdin: true
           tty: true

docs/modules/trino/pages/reference/environment-variables.adoc

@@ -18,7 +18,7 @@ spec:
       serviceAccount: integration-tests-sa
       containers:
         - name: trino-test-opa
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
           command: ["sleep", "infinity"]
           resources:
             requests:

tests/templates/kuttl/authentication/05-install-test-trino.yaml.j2

@@ -18,7 +18,7 @@ spec:
       serviceAccount: integration-tests-sa
       containers:
         - name: trino-test-helper
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
           command: ["sleep", "infinity"]
           resources:
             requests:

tests/templates/kuttl/logging/04-install-trino-test-runner.yaml

@@ -22,7 +22,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: trino-test-helper
-          image: docker.stackable.tech/stackable/testing-tools:0.2.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/testing-tools:0.2.0-stackable0.0.0-dev
           command: ["sleep", "infinity"]
 {% if test_scenario['values']['use-tls'] == 'true' %}
           volumeMounts:

tests/templates/kuttl/opa-authorization/30-install-opa-check.yaml

@@ -16,12 +16,12 @@ dimensions:
       - "451"
       - "455"
       # To use a custom image, add a comma and the full name after the product version
-      # - 455,docker.stackable.tech/stackable/trino:455-stackable0.0.0-dev
+      # - 455,oci.stackable.tech/sdp/trino:455-stackable0.0.0-dev
   - name: trino-latest
     values:
       - "455"
       # To use a custom image, add a comma and the full name after the product version
-      # - 455,docker.stackable.tech/stackable/trino:455-stackable0.0.0-dev
+      # - 455,oci.stackable.tech/sdp/trino:455-stackable0.0.0-dev
   - name: hive
     values:
       - 3.1.3