diff --git a/CHANGELOG.md b/CHANGELOG.md index 3a7ab414..cbb150bb 100644 --- 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 index 3573fc52..4b8b64fb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2935,8 +2935,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.84.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +version = "0.85.0" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "chrono", "clap", @@ -2974,7 +2974,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "darling", "proc-macro2", @@ -2985,7 +2985,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#b8fe43f7368249bf95b06d6cba3fd0135f7523ac" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "kube", "semver", diff --git a/Cargo.nix b/Cargo.nix index e4d81848..f8117b10 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -9522,13 +9522,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.84.1"; + version = "0.85.0"; edition = "2021"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; libName = "stackable_operator"; authors = [ @@ -9687,8 +9687,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -9722,8 +9722,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "b8fe43f7368249bf95b06d6cba3fd0135f7523ac"; - sha256 = "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i"; + rev = "59506c6202778889a27b6ae8153457e60a49c68d"; + sha256 = "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5"; }; libName = "stackable_shared"; authors = [ diff --git a/Cargo.toml b/Cargo.toml index af680dbc..6ad10256 100644 --- 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 index a0346ddb..290d87f2 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,6 +1,6 @@ { - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator-derive@0.3.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-operator@0.84.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.1#stackable-shared@0.0.1": "0vwq3dzxj56y4vrnw4ry7wajm12f32jipvc6f3izdrixy2pazq3i", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator-derive@0.3.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-operator@0.85.0": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#stackable-shared@0.0.1": "0rh476rmn5850yj85hq8znwmlfhd7l5bkxz0n5i9m4cddxhi2cl5", "git+https://github.com/stackabletech/product-config.git?tag=0.7.0#product-config@0.7.0": "0gjsm80g6r75pm3824dcyiz4ysq1ka4c1if6k1mjm9cnd5ym0gny" } \ No newline at end of file diff --git a/deploy/helm/opa-operator/crds/crds.yaml b/deploy/helm/opa-operator/crds/crds.yaml index aca62fda..59bf7630 100644 --- 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 index b90b2af4..83773cd1 100644 --- 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 index a21f99f5..06a7c036 100644 --- 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 index 2647cf23..8d58df98 100644 --- 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 index f6770ed2..816f6148 100644 --- 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 index 528c57ef..89c66041 100644 --- 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 index ab1c2975..493f6eaf 100644 --- 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 index f6770ed2..816f6148 100644 --- 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 index aa2bdfe0..5bd30729 100644 --- 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: