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

* replace repo urls

* use draft op-rs branch for oci changes

* use patch instead of overriding dependencies

* bump stackable-operator version

* revert patch section changes

* add changelog entry

---------

Co-authored-by: Andrew Kenworthy <[email protected]>

CHANGELOG.md

@@ -14,9 +14,14 @@ All notable changes to this project will be documented in this file.
 - Made RSA key length configurable for certificates issued by cert-manager ([#528]).
 - Kerberos principal backends now also provision principals for IP address, not just DNS hostnames ([#552]).
 
+### Changed
+
+- Default to OCI for image metadata ([#544]).
+
 [#528]: https://github.com/stackabletech/secret-operator/pull/528
 [#548]: https://github.com/stackabletech/secret-operator/pull/548
 [#552]: https://github.com/stackabletech/secret-operator/pull/552
+[#544]: https://github.com/stackabletech/secret-operator/pull/544
 
 ## [24.11.1] - 2025-01-10
 

Cargo.toml

@@ -37,7 +37,7 @@ serde_json = "1.0"
 serde_yaml = "0.9"
 snafu = "0.8"
 socket2 = { version = "0.5", features = ["all"] }
-stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1", features = ["time"] }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0", features = ["time"] }
 strum = { version = "0.26", features = ["derive"] }
 sys-mount = { version = "3.0", default-features = false }
 tempfile = "3.12"

deploy/helm/secret-operator/values.yaml

@@ -1,13 +1,13 @@
 # Default values for secret-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/secret-operator
+  repository: oci.stackable.tech/sdp/secret-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 
 csiProvisioner:
   image:
-    repository: docker.stackable.tech/k8s/sig-storage/csi-provisioner
+    repository: oci.stackable.tech/sdp/sig-storage/csi-provisioner
     tag: v5.1.0
     pullPolicy: IfNotPresent
   resources:
@@ -19,7 +19,7 @@ csiProvisioner:
       memory: 128Mi
 csiNodeDriverRegistrar:
   image:
-    repository: docker.stackable.tech/k8s/sig-storage/csi-node-driver-registrar
+    repository: oci.stackable.tech/sdp/sig-storage/csi-node-driver-registrar
     tag: v2.13.0
     pullPolicy: IfNotPresent
   resources:

tests/templates/kuttl/cert-manager-tls/consumer.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: consumer
-          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:
             - bash
           args:

tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2

@@ -11,7 +11,7 @@ spec:
     spec:
       containers:
         - 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
           command:
             - bash
           args:

tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2

@@ -23,7 +23,7 @@ spec:
         runAsUser: 0
       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
@@ -44,7 +44,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
@@ -57,7 +57,7 @@ spec:
             - mountPath: /var/kerberos/krb5kdc
               name: data
         - 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
@@ -70,7 +70,7 @@ spec:
             - mountPath: /var/kerberos/krb5kdc
               name: data
         - 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:

tests/templates/kuttl/kerberos/kinit-client.yaml.j2

@@ -10,7 +10,7 @@ spec:
       serviceAccount: integration-tests-sa
       containers:
         - 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
           command:
             - bash
           args:

tests/templates/kuttl/listener/02-client.yaml.j2

@@ -50,7 +50,7 @@ spec:
       serviceAccount: client-sa
       containers:
         - name: client
-          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:
             - sh
           args:

tests/templates/kuttl/tls/consumer.yaml

@@ -9,7 +9,7 @@ spec:
     spec:
       containers:
         - name: consumer
-          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:
             - bash
           args: