From 91d0a204e8f1fbf745364a186ed3c4534ce0dcc7 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy <1712947+adwk67@users.noreply.github.com> Date: Wed, 29 Jan 2025 15:59:14 +0100 Subject: [PATCH] chore: add oci references, merge templating changes (#810) * replace docker references with oci * bump operator-rs to 0.85 * changelog --------- Co-authored-by: Xenia --- CHANGELOG.md | 5 +++++ Cargo.lock | 8 ++++---- Cargo.nix | 14 +++++++------- Cargo.toml | 2 +- crate-hashes.json | 6 +++--- deploy/helm/kafka-operator/crds/crds.yaml | 4 ++-- deploy/helm/kafka-operator/values.yaml | 2 +- .../pages/reference/environment-variables.adoc | 6 +++--- .../kuttl/kerberos/01-install-krb5-kdc.yaml.j2 | 8 ++++---- .../kuttl/kerberos/30-access-kafka.txt.j2 | 2 +- .../logging/05-install-kafka-test-runner.yaml | 2 +- .../kuttl/smoke/40-install-test-container.yaml | 2 +- .../templates/kuttl/upgrade/03-write-data.yaml.j2 | 2 +- tests/templates/kuttl/upgrade/05-read-data.yaml.j2 | 2 +- tests/test-definition.yaml | 4 ++-- 15 files changed, 37 insertions(+), 32 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c64d5e0b..5acafbcb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,9 +16,14 @@ All notable changes to this project will be documented in this file. - Run a `containerdebug` process in the background of each Kafka container to collect debugging information ([#803]). - Aggregate emitted Kubernetes events on the CustomResources ([#809]). +### Changed + +- Default to OCI for image metadata and product image selection ([#810]). + [#796]: https://github.com/stackabletech/kafka-operator/pull/796 [#803]: https://github.com/stackabletech/kafka-operator/pull/803 [#809]: https://github.com/stackabletech/kafka-operator/pull/809 +[#810]: https://github.com/stackabletech/kafka-operator/pull/810 [#813]: https://github.com/stackabletech/kafka-operator/pull/813 ## [24.11.1] - 2025-01-10 diff --git a/Cargo.lock b/Cargo.lock index a15017d6..830576ba 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2361,8 +2361,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", @@ -2400,7 +2400,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", @@ -2411,7 +2411,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 1d6ded41..03f1165b 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7354,13 +7354,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 = [ @@ -7519,8 +7519,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"; @@ -7554,8 +7554,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 a3698f11..a1e4f743 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,7 +23,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/kafka-operator/crds/crds.yaml b/deploy/helm/kafka-operator/crds/crds.yaml index ea903f8e..eeec1528 100644 --- a/deploy/helm/kafka-operator/crds/crds.yaml +++ b/deploy/helm/kafka-operator/crds/crds.yaml @@ -663,7 +663,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`. @@ -690,7 +690,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/kafka-operator/values.yaml b/deploy/helm/kafka-operator/values.yaml index 73088639..3ae1dee7 100644 --- a/deploy/helm/kafka-operator/values.yaml +++ b/deploy/helm/kafka-operator/values.yaml @@ -1,7 +1,7 @@ # Default values for kafka-operator. --- image: - repository: docker.stackable.tech/stackable/kafka-operator + repository: oci.stackable.tech/sdp/kafka-operator pullPolicy: IfNotPresent pullSecrets: [] diff --git a/docs/modules/kafka/pages/reference/environment-variables.adoc b/docs/modules/kafka/pages/reference/environment-variables.adoc index d3e4287d..cc7dd3a2 100644 --- a/docs/modules/kafka/pages/reference/environment-variables.adoc +++ b/docs/modules/kafka/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/kafka-operator:latest +oci.stackable.tech/sdp/kafka-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/kafka-operator:latest + oci.stackable.tech/sdp/kafka-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/kafka-operator:latest +oci.stackable.tech/sdp/kafka-operator:0.0.0-dev ---- diff --git a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 index fa04cc0d..69ceec81 100644 --- a/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 +++ b/tests/templates/kuttl/kerberos/01-install-krb5-kdc.yaml.j2 @@ -15,7 +15,7 @@ spec: serviceAccountName: test-sa 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 @@ -36,7 +36,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 @@ -54,7 +54,7 @@ spec: runAsUser: 0 {% endif %} - 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 @@ -72,7 +72,7 @@ spec: runAsUser: 0 {% endif %} - 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: diff --git a/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2 b/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2 index 7fa56095..0c51003b 100644 --- a/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2 +++ b/tests/templates/kuttl/kerberos/30-access-kafka.txt.j2 @@ -9,7 +9,7 @@ spec: serviceAccountName: test-sa containers: - name: access-kafka - image: docker.stackable.tech/stackable/kafka:{{ test_scenario['values']['kafka'] }}-stackable0.0.0-dev + image: oci.stackable.tech/sdp/kafka:{{ test_scenario['values']['kafka'] }}-stackable0.0.0-dev command: - /bin/bash - /tmp/script/script.sh diff --git a/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml b/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml index a27ff48c..d4c8fe76 100644 --- a/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml +++ b/tests/templates/kuttl/logging/05-install-kafka-test-runner.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: kafka-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/40-install-test-container.yaml b/tests/templates/kuttl/smoke/40-install-test-container.yaml index 0568b299..d2d79cc7 100644 --- a/tests/templates/kuttl/smoke/40-install-test-container.yaml +++ b/tests/templates/kuttl/smoke/40-install-test-container.yaml @@ -23,7 +23,7 @@ spec: spec: containers: - name: webhdfs - 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/upgrade/03-write-data.yaml.j2 b/tests/templates/kuttl/upgrade/03-write-data.yaml.j2 index 600c563d..b03d20ea 100644 --- a/tests/templates/kuttl/upgrade/03-write-data.yaml.j2 +++ b/tests/templates/kuttl/upgrade/03-write-data.yaml.j2 @@ -17,7 +17,7 @@ spec: {% endif %} containers: - name: write-data - image: docker.stackable.tech/stackable/kafka-testing-tools:1.0.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/kafka-testing-tools:1.0.0-stackable0.0.0-dev command: [sh, -euo, pipefail, -c] args: - | diff --git a/tests/templates/kuttl/upgrade/05-read-data.yaml.j2 b/tests/templates/kuttl/upgrade/05-read-data.yaml.j2 index 6a3f3ea4..d766466c 100644 --- a/tests/templates/kuttl/upgrade/05-read-data.yaml.j2 +++ b/tests/templates/kuttl/upgrade/05-read-data.yaml.j2 @@ -17,7 +17,7 @@ spec: {% endif %} containers: - name: read-data - image: docker.stackable.tech/stackable/kafka-testing-tools:1.0.0-stackable0.0.0-dev + image: oci.stackable.tech/sdp/kafka-testing-tools:1.0.0-stackable0.0.0-dev command: [sh, -euo, pipefail, -c] args: - | diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index ca7af2e3..05e2d5d9 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -10,13 +10,13 @@ dimensions: - 3.8.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. - # - 3.8.0,docker.stackable.tech/stackable/kafka:3.8.0-stackable0.0.0-dev + # - 3.8.0,oci.stackable.tech/sdp/kafka:3.8.0-stackable0.0.0-dev - name: kafka-latest values: - 3.7.1 # Using LTS version here # 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. - # - 3.7.1,docker.stackable.tech/stackable/kafka:3.7.1-stackable0.0.0-dev + # - 3.7.1,oci.stackable.tech/sdp/kafka:3.7.1-stackable0.0.0-dev - name: zookeeper values: - 3.9.2