chore: add oci references, merge templating changes

CHANGELOG.md

@@ -7,8 +7,13 @@
 - Run a `containerdebug` process in the background of each Superset container to collect debugging information ([#578]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#585]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#586]).
+
 [#578]: https://github.com/stackabletech/superset-operator/pull/578
 [#585]: https://github.com/stackabletech/superset-operator/pull/585
+[#586]: https://github.com/stackabletech/superset-operator/pull/586
 
 ## [24.11.1] - 2025-01-10
 

Cargo.toml

@@ -23,11 +23,11 @@ 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" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"
 
-# [patch."https://github.com/stackabletech/operator-rs.git"]
-# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
+[patch."https://github.com/stackabletech/operator-rs.git"]
+stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" }
 # stackable-operator = { path = "../operator-rs/crates/stackable-operator" }

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

@@ -130,7 +130,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`.
@@ -157,7 +157,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:

deploy/helm/superset-operator/values.yaml

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

docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml

@@ -13,7 +13,7 @@ spec:
         name: config
       containers:
       - name: superset
-        image: docker.stackable.tech/stackable/superset:4.0.2-stackable0.0.0-dev
+        image: oci.stackable.tech/sdp/superset:4.0.2-stackable0.0.0-dev
         command: [
           "/bin/sh",
           "-c",

docs/modules/superset/examples/getting_started/superset-load-examples-job.yaml.j2

@@ -13,7 +13,7 @@ spec:
         name: config
       containers:
       - name: superset
-        image: docker.stackable.tech/stackable/superset:4.0.2-stackable{{ versions.superset }}
+        image: oci.stackable.tech/sdp/superset:4.0.2-stackable{{ versions.superset }}
         command: [
           "/bin/sh",
           "-c",

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

@@ -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/superset-operator:latest
+oci.stackable.tech/sdp/superset-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/superset-operator:latest
+    oci.stackable.tech/sdp/superset-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/superset-operator:latest
+oci.stackable.tech/sdp/superset-operator:0.0.0-dev
 ----

tests/templates/kuttl/ldap/60-install-test-container.yaml

@@ -18,6 +18,6 @@ spec:
     spec:
       containers:
         - name: python
-          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

tests/templates/kuttl/logging/30-install-test-container.yaml

@@ -23,6 +23,6 @@ spec:
     spec:
       containers:
         - name: test-superset-python
-          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

tests/templates/kuttl/oidc/50-install-test-container.yaml.j2

@@ -55,7 +55,7 @@ spec:
         fsGroup: 1000
       containers:
         - name: python
-          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
           resources:

tests/templates/kuttl/smoke/40-install-test-container.yaml

@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: python
-          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
           resources: