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

* replace docker references with oci * bump operator-rs to 0.85 * changelog --------- Co-authored-by: Xenia <[email protected]>
stackabletech · Jan 29, 2025 · 91d0a20 · 91d0a20
1 parent d227578
commit 91d0a20
Show file tree

Hide file tree

Showing 15 changed files with 37 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,9 +16,14 @@ All notable changes to this project will be documented in this file.
 - Run a `containerdebug` process in the background of each Kafka container to collect debugging information ([#803]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#809]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#810]).
+
 [#796]: https://github.com/stackabletech/kafka-operator/pull/796
 [#803]: https://github.com/stackabletech/kafka-operator/pull/803
 [#809]: https://github.com/stackabletech/kafka-operator/pull/809
+[#810]: https://github.com/stackabletech/kafka-operator/pull/810
 [#813]: https://github.com/stackabletech/kafka-operator/pull/813
 
 ## [24.11.1] - 2025-01-10

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -23,7 +23,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" }
 strum = { version = "0.26", features = ["derive"] }
 tokio = { version = "1.40", features = ["full"] }
 tracing = "0.1"

diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/deploy/helm/kafka-operator/crds/crds.yaml b/deploy/helm/kafka-operator/crds/crds.yaml
@@ -663,7 +663,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`.
@@ -690,7 +690,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:

diff --git a/deploy/helm/kafka-operator/values.yaml b/deploy/helm/kafka-operator/values.yaml
@@ -1,7 +1,7 @@
 # Default values for kafka-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/kafka-operator
+  repository: oci.stackable.tech/sdp/kafka-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 

diff --git a/docs/modules/kafka/pages/reference/environment-variables.adoc b/docs/modules/kafka/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/kafka-operator:latest
+oci.stackable.tech/sdp/kafka-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/kafka-operator:latest
+    oci.stackable.tech/sdp/kafka-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/kafka-operator:latest
+oci.stackable.tech/sdp/kafka-operator:0.0.0-dev
 ----
diff --git a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: test-sa
       initContainers:
         - name: init
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - sh
             - -euo
@@ -36,7 +36,7 @@ spec:
               name: data
       containers:
         - name: kdc
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - krb5kdc
             - -n
@@ -54,7 +54,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: kadmind
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           args:
             - kadmind
             - -nofork
@@ -72,7 +72,7 @@ spec:
             runAsUser: 0
 {% endif %}
         - name: client
-          image: docker.stackable.tech/stackable/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/krb5:{{ test_scenario['values']['krb5'] }}-stackable0.0.0-dev
           tty: true
           stdin: true
           env:

diff --git a/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2 b/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2
@@ -9,7 +9,7 @@ spec:
       serviceAccountName: test-sa
       containers:
         - name: access-kafka
-          image: docker.stackable.tech/stackable/kafka:{{ test_scenario['values']['kafka'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/kafka:{{ test_scenario['values']['kafka'] }}-stackable0.0.0-dev
           command:
             - /bin/bash
             - /tmp/script/script.sh

diff --git a/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml b/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml
@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
         - name: kafka-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
diff --git a/tests/templates/kuttl/smoke/40-install-test-container.yaml b/tests/templates/kuttl/smoke/40-install-test-container.yaml
@@ -23,7 +23,7 @@ spec:
     spec:
       containers:
         - name: webhdfs
-          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:

diff --git a/tests/templates/kuttl/upgrade/03-write-data.yaml.j2 b/tests/templates/kuttl/upgrade/03-write-data.yaml.j2
@@ -17,7 +17,7 @@ spec:
 {% endif %}
       containers:
         - name: write-data
-          image: docker.stackable.tech/stackable/kafka-testing-tools:1.0.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/kafka-testing-tools:1.0.0-stackable0.0.0-dev
           command: [sh, -euo, pipefail, -c]
           args:
             - |

diff --git a/tests/templates/kuttl/upgrade/05-read-data.yaml.j2 b/tests/templates/kuttl/upgrade/05-read-data.yaml.j2
@@ -17,7 +17,7 @@ spec:
 {% endif %}
       containers:
         - name: read-data
-          image: docker.stackable.tech/stackable/kafka-testing-tools:1.0.0-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/kafka-testing-tools:1.0.0-stackable0.0.0-dev
           command: [sh, -euo, pipefail, -c]
           args:
             - |

diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -10,13 +10,13 @@ dimensions:
       - 3.8.0
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.
-      # - 3.8.0,docker.stackable.tech/stackable/kafka:3.8.0-stackable0.0.0-dev
+      # - 3.8.0,oci.stackable.tech/sdp/kafka:3.8.0-stackable0.0.0-dev
   - name: kafka-latest
     values:
       - 3.7.1 # Using LTS version here
       # Alternatively, if you want to use a custom image, append a comma and the full image name to the product version
       # as in the example below.
-      # - 3.7.1,docker.stackable.tech/stackable/kafka:3.7.1-stackable0.0.0-dev
+      # - 3.7.1,oci.stackable.tech/sdp/kafka:3.7.1-stackable0.0.0-dev
   - name: zookeeper
     values:
       - 3.9.2