From f0735c189431e9d1f850e2536fb3357f62609e75 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 17 Jan 2025 15:45:30 +0100 Subject: [PATCH 1/4] replace docker references with oci --- deploy/helm/listener-operator/values.yaml | 6 +++--- .../20-validate-all-ingresses-are-reachable.yaml.j2 | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/deploy/helm/listener-operator/values.yaml b/deploy/helm/listener-operator/values.yaml index 1ba6ff8e..8c599c1b 100644 --- a/deploy/helm/listener-operator/values.yaml +++ b/deploy/helm/listener-operator/values.yaml @@ -1,13 +1,13 @@ # Default values for listener-operator. --- image: - repository: docker.stackable.tech/stackable/listener-operator + repository: oci.stackable.tech/sdp/listener-operator pullPolicy: IfNotPresent pullSecrets: [] csiProvisioner: image: - repository: docker.stackable.tech/k8s/sig-storage/csi-provisioner + repository: oci.stackable.tech/sdp/sig-storage/csi-provisioner tag: v5.0.1 pullPolicy: IfNotPresent resources: @@ -19,7 +19,7 @@ csiProvisioner: memory: 128Mi csiNodeDriverRegistrar: image: - repository: docker.stackable.tech/k8s/sig-storage/csi-node-driver-registrar + repository: oci.stackable.tech/sdp/sig-storage/csi-node-driver-registrar tag: v2.11.1 pullPolicy: IfNotPresent resources: diff --git a/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2 b/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2 index 8d2ccfda..8df393d3 100644 --- a/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2 +++ b/tests/templates/kuttl/smoke-nodeport/20-validate-all-ingresses-are-reachable.yaml.j2 @@ -47,7 +47,7 @@ spec: serviceAccountName: query-ingresses-sa containers: - name: query-ingresses - 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 # NOTE: Hostname resolution does not work on our OKD clusters, so the command for testing the Hostname is omitted on Openshift. It would be better to omit this entire test value for Openshift but this is not (yet) possible in beku. {% if test_scenario['values']['openshift'] == 'true' and test_scenario['values']['addressType'] != "Hostname" %} command: From 5dc974f366ce6a885ddc5778ca405add840c9cdd Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 21 Jan 2025 12:45:28 +0100 Subject: [PATCH 2/4] use draft op-rs branch for oci changes --- Cargo.lock | 6 +++--- Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6b0ca51..fd4ddb34 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2519,7 +2519,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.84.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "chrono", "clap", @@ -2557,7 +2557,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.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "darling", "proc-macro2", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.84.0#af0d1f19d8770d346096a38c6dc82ba70e371039" +source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index 9fbc8b7e..e4cab153 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -34,4 +34,4 @@ tracing = "0.1.40" [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } -# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } +stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" } From 38562098b95bb17d199f40b31c0c11720db2dcbb Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 29 Jan 2025 10:42:09 +0100 Subject: [PATCH 3/4] bump operator-rs to 0.85.0, revert branch change --- Cargo.lock | 8 ++++---- Cargo.toml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3d84949e..854a3de2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2518,8 +2518,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", @@ -2557,7 +2557,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "darling", "proc-macro2", @@ -2568,7 +2568,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.1" -source = "git+https://github.com/stackabletech//operator-rs.git?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.85.0#59506c6202778889a27b6ae8153457e60a49c68d" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index 70a58260..279cc7ad 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,7 +22,7 @@ prost = "0.13" prost-types = "0.13" serde = "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"] } socket2 = { version = "0.5", features = ["all"] } tokio = { version = "1.40", features = ["full"] } @@ -34,4 +34,4 @@ tracing = "0.1.40" [patch."https://github.com/stackabletech/operator-rs.git"] # stackable-operator = { path = "../operator-rs/crates/stackable-operator" } -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" } +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" } From da2a0368a3473c4826d84ec6cf7f2bbcdc2c58c1 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Wed, 29 Jan 2025 10:46:09 +0100 Subject: [PATCH 4/4] changelog --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f3ae6060..f293275b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,12 @@ All notable changes to this project will be documented in this file. - Aggregate emitted Kubernetes events on the CustomResources ([#267]). +### Changed + +- Default to OCI for image metadata ([#268]). + [#267]: https://github.com/stackabletech/listener-operator/pull/267 +[#268]: https://github.com/stackabletech/listener-operator/pull/268 ## [24.11.1] - 2025-01-10