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

xeniape · web-flow · commit 8f1bc4e2e240 · 2025-01-30T09:41:30.000Z
* replace repo urls

* replace repo urls

* bump stackable-operator version

* add changelog entry
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,8 +9,13 @@
 - Run a `containerdebug` process in the background of each HBase container to collect debugging information ([#605]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#612]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#611]).
+
 [#598]: https://github.com/stackabletech/hbase-operator/pull/598
 [#605]: https://github.com/stackabletech/hbase-operator/pull/605
+[#611]: https://github.com/stackabletech/hbase-operator/pull/611
 [#612]: https://github.com/stackabletech/hbase-operator/pull/612
 
 ## [24.11.1] - 2025-01-09
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.nix b/Cargo.nix
diff --git a/Cargo.toml b/Cargo.toml
@@ -22,7 +22,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/hbase-operator/crds/crds.yaml b/deploy/helm/hbase-operator/crds/crds.yaml
@@ -126,7 +126,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`.
@@ -153,7 +153,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/hbase-operator/values.yaml b/deploy/helm/hbase-operator/values.yaml
@@ -1,7 +1,7 @@
 # Default values for hbase-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/hbase-operator
+  repository: oci.stackable.tech/sdp/hbase-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 
diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: hbck2
-        image: docker.stackable.tech/stackable/hbase:2.4.18-stackable0.0.0-dev
+        image: oci.stackable.tech/sdp/hbase:2.4.18-stackable0.0.0-dev
         volumeMounts:
         - name: hbase-config
           mountPath: /stackable/conf
diff --git a/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2 b/docs/modules/hbase/examples/usage-guide/hbck2-job.yaml.j2
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: hbck2
-        image: docker.stackable.tech/stackable/hbase:2.4.18-stackable{{ versions.hbase }}
+        image: oci.stackable.tech/sdp/hbase:2.4.18-stackable{{ versions.hbase }}
         volumeMounts:
         - name: hbase-config
           mountPath: /stackable/conf
diff --git a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: hbase
-        image: docker.stackable.tech/stackable/hbase:2.4.18-stackable0.0.0-dev
+        image: oci.stackable.tech/sdp/hbase:2.4.18-stackable0.0.0-dev
         volumeMounts:
         - name: hbase-config
           mountPath: /stackable/conf
diff --git a/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2 b/docs/modules/hbase/examples/usage-guide/snapshot-export-job.yaml.j2
@@ -8,7 +8,7 @@ spec:
     spec:
       containers:
       - name: hbase
-        image: docker.stackable.tech/stackable/hbase:2.4.18-stackable{{ versions.hbase }}
+        image: oci.stackable.tech/sdp/hbase:2.4.18-stackable{{ versions.hbase }}
         volumeMounts:
         - name: hbase-config
           mountPath: /stackable/conf
diff --git a/docs/modules/hbase/pages/reference/environment-variables.adoc b/docs/modules/hbase/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/hbase-operator:latest
+oci.stackable.tech/sdp/hbase-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/hbase-operator:latest
+    oci.stackable.tech/sdp/hbase-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/hbase-operator:latest
+oci.stackable.tech/sdp/hbase-operator:0.0.0-dev
 ----
diff --git a/rust/operator-binary/src/hbase_controller.rs b/rust/operator-binary/src/hbase_controller.rs
@@ -1300,9 +1300,7 @@ mod test {
         let hbase: HbaseCluster = serde_yaml::from_str(&input).expect("illegal test input");
 
         let resolved_image = ResolvedProductImage {
-            image: format!(
-                "docker.stackable.tech/stackable/hbase:{hbase_version}-stackable0.0.0-dev"
-            ),
+            image: format!("oci.stackable.tech/sdp/hbase:{hbase_version}-stackable0.0.0-dev"),
             app_version_label: hbase_version.to_string(),
             product_version: hbase_version.to_string(),
             image_pull_policy: "Never".to_string(),
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/20-access-hdfs.yaml.j2 b/tests/templates/kuttl/kerberos/20-access-hdfs.yaml.j2
@@ -15,7 +15,7 @@ commands:
             serviceAccountName: test-sa
             containers:
               - name: access-hdfs
-                image: docker.stackable.tech/stackable/hadoop:{{ test_scenario['values']['hdfs-latest'] }}-stackable0.0.0-dev
+                image: oci.stackable.tech/sdp/hadoop:{{ test_scenario['values']['hdfs-latest'] }}-stackable0.0.0-dev
                 env:
                   - name: HADOOP_CONF_DIR
                     value: /stackable/conf/hdfs
diff --git a/tests/templates/kuttl/kerberos/41-access-hbase.yaml.j2 b/tests/templates/kuttl/kerberos/41-access-hbase.yaml.j2
@@ -18,7 +18,7 @@ commands:
 {% if test_scenario['values']['hbase'].find(",") > 0 %}
                 image: "{{ test_scenario['values']['hbase'].split(',')[1] }}"
 {% else %}
-                image: docker.stackable.tech/stackable/hbase:{{ test_scenario['values']['hbase'] }}-stackable0.0.0-dev
+                image: oci.stackable.tech/sdp/hbase:{{ test_scenario['values']['hbase'] }}-stackable0.0.0-dev
 {% endif %}
                 env:
                   - name: HBASE_CONF_DIR
diff --git a/tests/templates/kuttl/kerberos/42-test-rest-server.yaml b/tests/templates/kuttl/kerberos/42-test-rest-server.yaml
@@ -9,7 +9,7 @@ spec:
       serviceAccountName: test-sa
       containers:
         - name: test-rest-server
-          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:
             - /bin/bash
             - -c
diff --git a/tests/templates/kuttl/logging/06-install-hbase-test-runner.yaml b/tests/templates/kuttl/logging/06-install-hbase-test-runner.yaml
@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
         - name: hbase-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/omid/40-install-omid.yaml.j2 b/tests/templates/kuttl/omid/40-install-omid.yaml.j2
@@ -46,7 +46,7 @@ spec:
 {% if test_scenario['values']['omid'].find(",") > 0 %}
           image: "{{ test_scenario['values']['omid'].split(',')[1] }}"
 {% else %}
-          image: docker.stackable.tech/stackable/omid:{{ test_scenario['values']['omid'] }}-stackable0.0.0-dev
+          image: oci.stackable.tech/sdp/omid:{{ test_scenario['values']['omid'] }}-stackable0.0.0-dev
 {% endif %}
           imagePullPolicy: IfNotPresent
           command:
diff --git a/tests/templates/kuttl/opa/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/opa/01-install-krb5-kdc.yaml.j2
@@ -14,7 +14,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
@@ -35,7 +35,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
@@ -53,7 +53,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
@@ -71,7 +71,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/opa/41-access-hbase.yaml.j2 b/tests/templates/kuttl/opa/41-access-hbase.yaml.j2
@@ -18,7 +18,7 @@ commands:
 {% if test_scenario['values']['hbase-opa'].find(",") > 0 %}
                 image: "{{ test_scenario['values']['hbase-opa'].split(',')[1] }}"
 {% else %}
-                image: docker.stackable.tech/stackable/hbase:{{ test_scenario['values']['hbase-opa'] }}-stackable0.0.0-dev
+                image: oci.stackable.tech/sdp/hbase:{{ test_scenario['values']['hbase-opa'] }}-stackable0.0.0-dev
 {% endif %}
                 env:
                   - name: HBASE_CONF_DIR
diff --git a/tests/templates/kuttl/opa/42-test-rest-server.yaml b/tests/templates/kuttl/opa/42-test-rest-server.yaml
@@ -9,7 +9,7 @@ spec:
       serviceAccountName: test-sa
       containers:
         - name: test-rest-server
-          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:
             - /bin/bash
             - -c
diff --git a/tests/templates/kuttl/profiling/04-install-test-container.yaml b/tests/templates/kuttl/profiling/04-install-test-container.yaml
@@ -26,7 +26,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:
diff --git a/tests/templates/kuttl/smoke/40-install-hbase-test-runner.yaml b/tests/templates/kuttl/smoke/40-install-hbase-test-runner.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: hbase-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
           resources:
diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml
@@ -5,17 +5,17 @@ dimensions:
       - 2.6.0
       - 2.4.18
       # To use a custom image, add a comma and the full name after the product version
-      # - 2.6.0,docker.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev
-      # - 2.4.18,docker.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev
+      # - 2.6.0,oci.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev
+      # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev
   - name: hbase-opa
     values:
       - 2.6.0
       # To use a custom image, add a comma and the full name after the product version
-      # - 2.6.0,docker.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev
+      # - 2.6.0,oci.stackable.tech/sandbox/hbase:2.6.0-stackable0.0.0-dev
   - name: hbase-latest
     values:
       - 2.6.0
-      # - 2.4.18,docker.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev
+      # - 2.4.18,oci.stackable.tech/sandbox/hbase:2.4.18-stackable0.0.0-dev
   - name: hdfs
     values:
       - 3.3.4
@@ -58,7 +58,7 @@ dimensions:
     values:
       - 1.1.2
       # To use a custom image, add a comma and the full name after the product version
-      # - 1.1.0,docker.stackable.tech/sandbox/omid:1.1.0-stackable0.0.0-dev
+      # - 1.1.0,oci.stackable.tech/sandbox/omid:1.1.0-stackable0.0.0-dev
 tests:
   - name: smoke
     dimensions:
