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

adwk67 · xeniape · web-flow · commit c11ff525383f · 2025-01-29T12:14:22.000Z
* replace nexus references with harbor

* use draft op-rs branch for oci changes

* regenerate charts

* bump operator-rs to 0.85

* changelog and minor test change

* linting

---------

Co-authored-by: Xenia &lt;xeniafischer@hotmail.de&gt;
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,9 +11,14 @@ All notable changes to this project will be documented in this file.
 - Run a `containerdebug` process in the background of each Zookeeper container to collect debugging information ([#881]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#904]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#905]).
+
 [#881]: https://github.com/stackabletech/zookeeper-operator/pull/881
 [#892]: https://github.com/stackabletech/zookeeper-operator/pull/892
 [#904]: https://github.com/stackabletech/zookeeper-operator/pull/904
+[#905]: https://github.com/stackabletech/zookeeper-operator/pull/905
 
 ## [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" }
 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"] }
diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/deploy/helm/zookeeper-operator/crds/crds.yaml b/deploy/helm/zookeeper-operator/crds/crds.yaml
@@ -123,7 +123,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`.
@@ -150,7 +150,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/zookeeper-operator/values.yaml b/deploy/helm/zookeeper-operator/values.yaml
@@ -1,7 +1,7 @@
 # Default values for zookeeper-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/zookeeper-operator
+  repository: oci.stackable.tech/sdp/zookeeper-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh
@@ -70,7 +70,7 @@ zkCli_ls() {
 # tag::zkcli-ls[]
 kubectl run my-pod \
   --stdin --tty --quiet --restart=Never \
-  --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev -- \
+  --image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev -- \
   bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \
   kubectl logs my-pod && \
   kubectl delete pods my-pod
diff --git a/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2 b/docs/modules/zookeeper/examples/getting_started/code/getting_started.sh.j2
@@ -70,7 +70,7 @@ zkCli_ls() {
 # tag::zkcli-ls[]
 kubectl run my-pod \
   --stdin --tty --quiet --restart=Never \
-  --image docker.stackable.tech/stackable/zookeeper:3.9.2-stackable{{ versions.zookeeper }} -- \
+  --image oci.stackable.tech/sdp/zookeeper:3.9.2-stackable{{ versions.zookeeper }} -- \
   bin/zkCli.sh -server simple-zk-server-default:2282 ls / > /dev/null && \
   kubectl logs my-pod && \
   kubectl delete pods my-pod
diff --git a/docs/modules/zookeeper/pages/reference/environment-variables.adoc b/docs/modules/zookeeper/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/zookeeper-operator:latest
+oci.stackable.tech/sdp/zookeeper-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/zookeeper-operator:latest
+    oci.stackable.tech/sdp/zookeeper-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/zookeeper-operator:latest
+oci.stackable.tech/sdp/zookeeper-operator:0.0.0-dev
 ----
diff --git a/tests/templates/kuttl/logging/20-install-check.yaml b/tests/templates/kuttl/logging/20-install-check.yaml
@@ -29,6 +29,6 @@ spec:
     spec:
       containers:
         - name: zk-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
           stdin: true
           tty: true
diff --git a/tests/templates/kuttl/smoke/20-install-check.yaml b/tests/templates/kuttl/smoke/20-install-check.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
         - name: zk-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
           stdin: true
           tty: true
           resources:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -4,12 +4,12 @@ dimensions:
     values:
       - 3.9.2
       # To use a custom image, add a comma and the full name after the product version
-      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
+      # - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev
   - name: zookeeper-latest
     values:
       - 3.9.2
       # To use a custom image, add a comma and the full name after the product version
-      # - 3.9.2,docker.stackable.tech/stackable/zookeeper:3.9.2-stackable0.0.0-dev
+      # - 3.9.2,oci.stackable.tech/sdp/zookeeper:3.9.2-stackable0.0.0-dev
   - name: use-server-tls
     values:
       - "true"
