From 502221609b582d87eb0290b7ecaed0ed9a0dd280 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 17 Jan 2025 12:49:49 +0100 Subject: [PATCH 1/5] replace nexus references with harbor --- deploy/helm/druid-operator/values.yaml | 2 +- .../druid/pages/reference/environment-variables.adoc | 6 +++--- .../kuttl/authorizer/05-checks-container.yaml | 2 +- .../kuttl/hdfs-deep-storage/04-checks-container.yaml | 2 +- .../kuttl/ingestion-no-s3-ext/04-checks-container.yaml | 2 +- .../kuttl/ingestion-s3-ext/04-checks-container.yaml | 2 +- tests/templates/kuttl/ldap/03-install-test-druid.yaml | 2 +- .../kuttl/logging/06-install-druid-test-runner.yaml | 2 +- .../kuttl/oidc/51-install-test-container.yaml.j2 | 2 +- .../kuttl/s3-deep-storage/07-checks-container.yaml | 2 +- tests/templates/kuttl/smoke/60-checks-container.yaml | 2 +- tests/templates/kuttl/tls/05-install-checks.yaml.j2 | 2 +- tests/test-definition.yaml | 10 +++++----- 13 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deploy/helm/druid-operator/values.yaml b/deploy/helm/druid-operator/values.yaml index cd19a973..6808323c 100644 --- a/deploy/helm/druid-operator/values.yaml +++ b/deploy/helm/druid-operator/values.yaml @@ -1,7 +1,7 @@ # Default values for druid-operator. --- image: - repository: docker.stackable.tech/stackable/druid-operator + repository: oci.stackable.tech/stackable/druid-operator pullPolicy: IfNotPresent pullSecrets: [] diff --git a/docs/modules/druid/pages/reference/environment-variables.adoc b/docs/modules/druid/pages/reference/environment-variables.adoc index 1343e2c9..2083b351 100644 --- a/docs/modules/druid/pages/reference/environment-variables.adoc +++ b/docs/modules/druid/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/druid-operator:latest +oci.stackable.tech/sdp/druid-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/druid-operator:latest + oci.stackable.tech/sdp/druid-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/druid-operator:latest +oci.stackable.tech/sdp/druid-operator:0.0.0-dev ---- diff --git a/tests/templates/kuttl/authorizer/05-checks-container.yaml b/tests/templates/kuttl/authorizer/05-checks-container.yaml index dd9ecb77..944fccd3 100644 --- a/tests/templates/kuttl/authorizer/05-checks-container.yaml +++ b/tests/templates/kuttl/authorizer/05-checks-container.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: checks - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/hdfs-deep-storage/04-checks-container.yaml b/tests/templates/kuttl/hdfs-deep-storage/04-checks-container.yaml index dd9ecb77..944fccd3 100644 --- a/tests/templates/kuttl/hdfs-deep-storage/04-checks-container.yaml +++ b/tests/templates/kuttl/hdfs-deep-storage/04-checks-container.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: checks - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/ingestion-no-s3-ext/04-checks-container.yaml b/tests/templates/kuttl/ingestion-no-s3-ext/04-checks-container.yaml index dd9ecb77..944fccd3 100644 --- a/tests/templates/kuttl/ingestion-no-s3-ext/04-checks-container.yaml +++ b/tests/templates/kuttl/ingestion-no-s3-ext/04-checks-container.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: checks - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/ingestion-s3-ext/04-checks-container.yaml b/tests/templates/kuttl/ingestion-s3-ext/04-checks-container.yaml index dd9ecb77..944fccd3 100644 --- a/tests/templates/kuttl/ingestion-s3-ext/04-checks-container.yaml +++ b/tests/templates/kuttl/ingestion-s3-ext/04-checks-container.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: checks - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/ldap/03-install-test-druid.yaml b/tests/templates/kuttl/ldap/03-install-test-druid.yaml index 450becea..bfdb78b5 100644 --- a/tests/templates/kuttl/ldap/03-install-test-druid.yaml +++ b/tests/templates/kuttl/ldap/03-install-test-druid.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: test-druid - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/logging/06-install-druid-test-runner.yaml b/tests/templates/kuttl/logging/06-install-druid-test-runner.yaml index f1657554..6926f5a2 100644 --- a/tests/templates/kuttl/logging/06-install-druid-test-runner.yaml +++ b/tests/templates/kuttl/logging/06-install-druid-test-runner.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: druid-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 terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2 b/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2 index fc1bed83..4365c312 100644 --- a/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2 +++ b/tests/templates/kuttl/oidc/51-install-test-container.yaml.j2 @@ -55,7 +55,7 @@ spec: fsGroup: 1000 containers: - name: python - 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/s3-deep-storage/07-checks-container.yaml b/tests/templates/kuttl/s3-deep-storage/07-checks-container.yaml index dd9ecb77..944fccd3 100644 --- a/tests/templates/kuttl/s3-deep-storage/07-checks-container.yaml +++ b/tests/templates/kuttl/s3-deep-storage/07-checks-container.yaml @@ -17,6 +17,6 @@ spec: spec: containers: - name: checks - 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"] terminationGracePeriodSeconds: 1 diff --git a/tests/templates/kuttl/smoke/60-checks-container.yaml b/tests/templates/kuttl/smoke/60-checks-container.yaml index 4aafaf71..6dabe317 100644 --- a/tests/templates/kuttl/smoke/60-checks-container.yaml +++ b/tests/templates/kuttl/smoke/60-checks-container.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: checks - 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/tls/05-install-checks.yaml.j2 b/tests/templates/kuttl/tls/05-install-checks.yaml.j2 index 1700f687..eeb1fb10 100644 --- a/tests/templates/kuttl/tls/05-install-checks.yaml.j2 +++ b/tests/templates/kuttl/tls/05-install-checks.yaml.j2 @@ -50,7 +50,7 @@ spec: runAsUser: 0 containers: - name: druid-checks - 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"] env: - name: DRUID_OIDC diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index a31c7e6f..81fe82cb 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -13,15 +13,15 @@ dimensions: - name: druid values: - - 26.0.0 - - 30.0.0 + - 26.0.0,oci.stackable.tech/sdp/druid:26.0.0-stackable0.0.0-dev + - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev # To use a custom image, add a comma and the full name after the product version - # - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev + # - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev - name: druid-latest values: - - 30.0.0 + - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev # To use a custom image, add a comma and the full name after the product version - # - 28.0.1,docker.stackable.tech/sandbox/druid:28.0.1-stackable0.0.0-dev + # - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev - name: zookeeper values: - 3.9.2 From de834fd35b97d353f43ef108f4a638ba6f43b2b5 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 17 Jan 2025 13:33:29 +0100 Subject: [PATCH 2/5] corrected oci folder name --- deploy/helm/druid-operator/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/druid-operator/values.yaml b/deploy/helm/druid-operator/values.yaml index 6808323c..abaf43a4 100644 --- a/deploy/helm/druid-operator/values.yaml +++ b/deploy/helm/druid-operator/values.yaml @@ -1,7 +1,7 @@ # Default values for druid-operator. --- image: - repository: oci.stackable.tech/stackable/druid-operator + repository: oci.stackable.tech/sdp/druid-operator pullPolicy: IfNotPresent pullSecrets: [] From 0fc828ecfa2ab113707135b0fa149494601f0a59 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 29 Jan 2025 17:55:46 +0100 Subject: [PATCH 3/5] bump op-rs to 0-85 --- Cargo.lock | 8 ++++---- Cargo.nix | 14 +++++++------- Cargo.toml | 2 +- crate-hashes.json | 6 +++--- deploy/helm/druid-operator/crds/crds.yaml | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4f56486e..6a7e97f3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2429,8 +2429,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", @@ -2468,7 +2468,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", @@ -2479,7 +2479,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 fe9c30e2..a223d51c 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7545,13 +7545,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 = [ @@ -7710,8 +7710,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"; @@ -7745,8 +7745,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 c2a54195..b95d91a0 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/druid-operator/crds/crds.yaml b/deploy/helm/druid-operator/crds/crds.yaml index 70ed1b32..b9f36ee7 100644 --- a/deploy/helm/druid-operator/crds/crds.yaml +++ b/deploy/helm/druid-operator/crds/crds.yaml @@ -1796,7 +1796,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`. @@ -1823,7 +1823,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: From a5f47a1f1c2dcd72d6a4c6f34a2d1f018fdd9292 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 29 Jan 2025 17:56:45 +0100 Subject: [PATCH 4/5] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 58b6cdc5..816be139 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,8 +11,13 @@ All notable changes to this project will be documented in this file. - Run a `containerdebug` process in the background of each "druid" container to collect debugging information ([#667]). - Aggregate emitted Kubernetes events on the CustomResources ([#677]). +### Changed + +- Default to OCI for image metadata and product image selection ([#676]). + [#660]: https://github.com/stackabletech/druid-operator/pull/660 [#667]: https://github.com/stackabletech/druid-operator/pull/667 +[#676]: https://github.com/stackabletech/druid-operator/pull/676 [#677]: https://github.com/stackabletech/druid-operator/pull/677 ## [24.11.1] - 2025-01-09 From da28bfdfbd6278bc952b144931fc6808a2362853 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 29 Jan 2025 18:01:40 +0100 Subject: [PATCH 5/5] reverted test defs --- tests/test-definition.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test-definition.yaml b/tests/test-definition.yaml index 81fe82cb..2d1047c3 100644 --- a/tests/test-definition.yaml +++ b/tests/test-definition.yaml @@ -13,13 +13,13 @@ dimensions: - name: druid values: - - 26.0.0,oci.stackable.tech/sdp/druid:26.0.0-stackable0.0.0-dev - - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev + - 26.0.0 + - 30.0.0 # To use a custom image, add a comma and the full name after the product version # - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev - name: druid-latest values: - - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev + - 30.0.0 # To use a custom image, add a comma and the full name after the product version # - 30.0.0,oci.stackable.tech/sdp/druid:30.0.0-stackable0.0.0-dev - name: zookeeper