chore: add oci references, merge templating changes

CHANGELOG.md

@@ -12,9 +12,14 @@ All notable changes to this project will be documented in this file.
 - Support configuring JVM arguments ([#724]).
 - Aggregate emitted Kubernetes events on the CustomResources ([#742]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#741]).
+
 [#722]: https://github.com/stackabletech/nifi-operator/pull/722
 [#724]: https://github.com/stackabletech/nifi-operator/pull/724
 [#730]: https://github.com/stackabletech/nifi-operator/pull/730
+[#741]: https://github.com/stackabletech/nifi-operator/pull/741
 [#742]: https://github.com/stackabletech/nifi-operator/pull/742
 
 ## [24.11.1] - 2025-01-10

Cargo.toml

@@ -26,7 +26,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"

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

@@ -193,7 +193,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`.
@@ -220,7 +220,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/nifi-operator/values.yaml

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

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

docs/modules/nifi/pages/usage_guide/custom_processors.adoc

@@ -19,7 +19,7 @@ The basic Dockerfile below shows how to achieve this:
 
 [source,Dockerfile]
 ----
-FROM docker.stackable.tech/stackable/nifi:1.27.0-stackable0.0.0-dev
+FROM oci.stackable.tech/sdp/nifi:1.27.0-stackable0.0.0-dev
 COPY /path/to/your/nar.file /stackable/nifi/lib/
 ----
 

tests/templates/kuttl/ldap/03-install-test-nifi.yaml

@@ -17,5 +17,5 @@ spec:
     spec:
       containers:
         - name: test-nifi
-          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: ["sleep", "infinity"]

tests/templates/kuttl/logging/05-install-nifi-test-runner.yaml

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

tests/templates/kuttl/oidc/20-login-test.yaml.j2

@@ -15,7 +15,7 @@ spec:
     spec:
       containers:
         - name: oidc-login-test
-          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: ["python", "/tmp/test-script/login.py"]
           env:
             - name: NAMESPACE

tests/templates/kuttl/smoke/50-install-test-nifi.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
         - name: test-nifi
-          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: ["sleep", "infinity"]
           resources:
             requests:

tests/templates/kuttl/upgrade/03-install-test-nifi.yaml

@@ -17,6 +17,6 @@ spec:
     spec:
       containers:
         - name: test-nifi
-          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/test-definition.yaml

@@ -12,7 +12,7 @@ dimensions:
       - 2.0.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.
-      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
+      # - 1.27.0,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: nifi_old
     values:
       - 1.27.0
@@ -21,13 +21,13 @@ dimensions:
       - 2.0.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.
-      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
+      # - 1.27.0,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: nifi-latest
     values:
       - 2.0.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.
-      # - 1.27.0,docker.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
+      # - 1.27.0,oci.stackable.tech/sandbox/nifi:1.27.0-stackable0.0.0-dev
   - name: ldap-use-tls
     values:
       - "false"