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

* remove references to nexus * re-add nexus actions * remove changes that will be suppliedm by templating * replace latest with 0.0.0-dev in harbor * bump op-rs to 0.85 * minor test def change * minor test def change II * changelog --------- Co-authored-by: Xenia <[email protected]>
stackabletech · Jan 29, 2025 · 6eecef5 · 6eecef5
1 parent bb7a337
commit 6eecef5
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -14,8 +14,13 @@ All notable changes to this project will be documented in this file.
 
 - Removed support for OPA `0.66.0` ([#677]).
 
+### Changed
+
+- Default to OCI for image metadata and product image selection ([#671]).
+
 [#666]: https://github.com/stackabletech/opa-operator/pull/666
 [#677]: https://github.com/stackabletech/opa-operator/pull/677
+[#671]: https://github.com/stackabletech/opa-operator/pull/671
 [#675]: https://github.com/stackabletech/opa-operator/pull/675
 
 ## [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
@@ -33,7 +33,7 @@ semver = "1.0"
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 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"] }
 tar = "0.4"
 tokio = { version = "1.40", features = ["full"] }

diff --git a/crate-hashes.json b/crate-hashes.json
diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml
@@ -265,7 +265,7 @@ spec:
                   description: The OPA image to use
                   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`.
@@ -292,7 +292,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/opa-operator/values.yaml b/deploy/helm/opa-operator/values.yaml
@@ -1,7 +1,7 @@
 # Default values for opa-operator.
 ---
 image:
-  repository: docker.stackable.tech/stackable/opa-operator
+  repository: oci.stackable.tech/sdp/opa-operator
   pullPolicy: IfNotPresent
   pullSecrets: []
 

diff --git a/docs/modules/opa/pages/reference/environment-variables.adoc b/docs/modules/opa/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/opa-operator:latest
+oci.stackable.tech/sdp/opa-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/opa-operator:latest
+    oci.stackable.tech/sdp/opa-operator:0.0.0-dev
 ----
 
 == WATCH_NAMESPACE
@@ -85,7 +85,7 @@ 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/opa-operator:latest
+oci.stackable.tech/sdp/opa-operator:0.0.0-dev
 ----
 
 == OPA_BUNDLE_BUILDER_CLUSTERROLE

diff --git a/tests/templates/kuttl/aas-user-info/20-install-test-regorule.yaml b/tests/templates/kuttl/aas-user-info/20-install-test-regorule.yaml
@@ -18,7 +18,7 @@ spec:
       serviceAccountName: test-sa
       containers:
       - name: test-regorule
-        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/keycloak-user-info/20-install-test-regorule.yaml b/tests/templates/kuttl/keycloak-user-info/20-install-test-regorule.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: test-regorule
-        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/logging/03-install-opa.yaml.j2 b/tests/templates/kuttl/logging/03-install-opa.yaml.j2
@@ -72,7 +72,7 @@ spec:
           spec:
             initContainers:
               - name: create-opa-log-dir
-                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
                 # Create the log directory for the opa container upfront
                 # to avoid a race condition between the opa and the
                 # vector container. If the vector container is

diff --git a/tests/templates/kuttl/logging/04-install-opa-test-runner.yaml b/tests/templates/kuttl/logging/04-install-opa-test-runner.yaml
@@ -44,6 +44,6 @@ spec:
       serviceAccountName: logging-sa
       containers:
         - name: opa-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/20-install-test-regorule.yaml b/tests/templates/kuttl/smoke/20-install-test-regorule.yaml
@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: test-regorule
-        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
@@ -3,13 +3,13 @@ dimensions:
   - name: opa
     values:
       # To use a custom image, add a comma and the full name after the product version
-      # 0.67.1,docker.stackable.tech/stackable/opa:0.67.1-stackable0.0.0-dev
+      # 0.67.1,oci.stackable.tech/sdp/opa:0.67.1-stackable0.0.0-dev
       - 0.67.1
       - 1.0.0
   - name: opa-latest
     values:
       # To use a custom image, add a comma and the full name after the product version
-      # 0.67.1,docker.stackable.tech/stackable/opa:0.67.1-stackable0.0.0-dev
+      # 0.67.1,oci.stackable.tech/sdp/opa:0.67.1-stackable0.0.0-dev
       - 1.0.0
   - name: keycloak
     values: