diff --git a/CHANGELOG.md b/CHANGELOG.md index 886d47c2..89b1db9f 100644 --- a/CHANGELOG.md +++ b/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 diff --git a/Cargo.lock b/Cargo.lock index cefd673c..3bbc1ced 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2374,8 +2374,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", @@ -2413,7 +2413,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", @@ -2424,7 +2424,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 cdc95499..32104b49 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7389,18 +7389,22 @@ rec { name = "rstest"; packageId = "rstest"; } + { + name = "serde_yaml"; + packageId = "serde_yaml"; + } ]; }; "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 = [ @@ -7559,8 +7563,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"; @@ -7594,8 +7598,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 5d8b2fb5..d22b6a11 100644 --- a/Cargo.toml +++ b/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" 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/nifi-operator/crds/crds.yaml b/deploy/helm/nifi-operator/crds/crds.yaml index dba55e52..99175501 100644 --- a/deploy/helm/nifi-operator/crds/crds.yaml +++ b/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: diff --git a/deploy/helm/nifi-operator/values.yaml b/deploy/helm/nifi-operator/values.yaml index 796543b8..49b15045 100644 --- a/deploy/helm/nifi-operator/values.yaml +++ b/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: [] diff --git a/docs/modules/nifi/pages/reference/environment-variables.adoc b/docs/modules/nifi/pages/reference/environment-variables.adoc index ef03f185..2bfaf328 100644 --- a/docs/modules/nifi/pages/reference/environment-variables.adoc +++ b/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 ---- diff --git a/docs/modules/nifi/pages/usage_guide/custom_processors.adoc b/docs/modules/nifi/pages/usage_guide/custom_processors.adoc index 9bb35c1b..d84bf8cc 100644 --- a/docs/modules/nifi/pages/usage_guide/custom_processors.adoc +++ b/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/ ---- diff --git a/tests/templates/kuttl/ldap/03-install-test-nifi.yaml b/tests/templates/kuttl/ldap/03-install-test-nifi.yaml index a55a0a41..4d23cee6 100644 --- a/tests/templates/kuttl/ldap/03-install-test-nifi.yaml +++ b/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"] diff --git a/tests/templates/kuttl/logging/05-install-nifi-test-runner.yaml b/tests/templates/kuttl/logging/05-install-nifi-test-runner.yaml index 9b33ad72..4f575dbb 100644 --- a/tests/templates/kuttl/logging/05-install-nifi-test-runner.yaml +++ b/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 diff --git a/tests/templates/kuttl/oidc/20-login-test.yaml.j2 b/tests/templates/kuttl/oidc/20-login-test.yaml.j2 index 782711f8..97e3443c 100644 --- a/tests/templates/kuttl/oidc/20-login-test.yaml.j2 +++ b/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 diff --git a/tests/templates/kuttl/smoke/50-install-test-nifi.yaml b/tests/templates/kuttl/smoke/50-install-test-nifi.yaml index b1928344..3bc67dbc 100644 --- a/tests/templates/kuttl/smoke/50-install-test-nifi.yaml +++ b/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: diff --git a/tests/templates/kuttl/upgrade/03-install-test-nifi.yaml b/tests/templates/kuttl/upgrade/03-install-test-nifi.yaml index 82510f85..6d799a20 100644 --- a/tests/templates/kuttl/upgrade/03-install-test-nifi.yaml +++ b/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 diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 0df3ef95..9d2728c5 100644 --- a/tests/test-definition.yaml +++ b/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"