From eb7a44ed683e73ddf746a4af44a5eed672b7bb48 Mon Sep 17 00:00:00 2001 From: xeniape Date: Fri, 17 Jan 2025 15:49:37 +0100 Subject: [PATCH 1/6] replace repo urls --- deploy/helm/secret-operator/values.yaml | 8 ++++---- tests/templates/kuttl/cert-manager-tls/consumer.yaml | 2 +- tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2 | 2 +- tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2 | 8 ++++---- tests/templates/kuttl/kerberos/kinit-client.yaml.j2 | 2 +- tests/templates/kuttl/listener/02-client.yaml.j2 | 2 +- tests/templates/kuttl/tls/consumer.yaml | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/deploy/helm/secret-operator/values.yaml b/deploy/helm/secret-operator/values.yaml index 1c12089e..559fe877 100644 --- a/deploy/helm/secret-operator/values.yaml +++ b/deploy/helm/secret-operator/values.yaml @@ -1,14 +1,14 @@ # Default values for secret-operator. --- image: - repository: docker.stackable.tech/stackable/secret-operator + repository: oci.stackable.tech/sdp/secret-operator pullPolicy: IfNotPresent pullSecrets: [] secretMigrationJob: enabled: true image: - repository: docker.stackable.tech/stackable/tools + repository: oci.stackable.tech/sdp/tools tag: 1.0.0-stackable24.11.0 pullPolicy: IfNotPresent resources: @@ -21,7 +21,7 @@ secretMigrationJob: 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: @@ -33,7 +33,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/cert-manager-tls/consumer.yaml b/tests/templates/kuttl/cert-manager-tls/consumer.yaml index 73ee1189..f66fbf52 100644 --- a/tests/templates/kuttl/cert-manager-tls/consumer.yaml +++ b/tests/templates/kuttl/cert-manager-tls/consumer.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: consumer - 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: - bash args: diff --git a/tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2 b/tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2 index b8f3eda8..40f1eaa6 100644 --- a/tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2 +++ b/tests/templates/kuttl/kerberos-ad/kinit-client.yaml.j2 @@ -11,7 +11,7 @@ spec: spec: containers: - 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 command: - bash args: diff --git a/tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2 b/tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2 index 703b6808..43a2f6e2 100644 --- a/tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2 +++ b/tests/templates/kuttl/kerberos/01-install-kdc.yaml.j2 @@ -22,7 +22,7 @@ spec: runAsUser: 0 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 @@ -43,7 +43,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 @@ -56,7 +56,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - 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 @@ -69,7 +69,7 @@ spec: - mountPath: /var/kerberos/krb5kdc name: data - 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/kinit-client.yaml.j2 b/tests/templates/kuttl/kerberos/kinit-client.yaml.j2 index 2c6a134a..61a5fe0a 100644 --- a/tests/templates/kuttl/kerberos/kinit-client.yaml.j2 +++ b/tests/templates/kuttl/kerberos/kinit-client.yaml.j2 @@ -10,7 +10,7 @@ spec: serviceAccount: integration-tests-sa containers: - 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 command: - bash args: diff --git a/tests/templates/kuttl/listener/02-client.yaml.j2 b/tests/templates/kuttl/listener/02-client.yaml.j2 index f3a87f15..4eb3e943 100644 --- a/tests/templates/kuttl/listener/02-client.yaml.j2 +++ b/tests/templates/kuttl/listener/02-client.yaml.j2 @@ -50,7 +50,7 @@ spec: serviceAccount: client-sa containers: - name: client - 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: - sh args: diff --git a/tests/templates/kuttl/tls/consumer.yaml b/tests/templates/kuttl/tls/consumer.yaml index 1b168f6e..dcd78cef 100644 --- a/tests/templates/kuttl/tls/consumer.yaml +++ b/tests/templates/kuttl/tls/consumer.yaml @@ -9,7 +9,7 @@ spec: spec: containers: - name: consumer - 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: - bash args: From cb98c2e8f27e602a2e2e0c69fdc48df724912fc4 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 21 Jan 2025 10:20:47 +0100 Subject: [PATCH 2/6] 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 75905165..c8e3e341 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2845,7 +2845,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", @@ -2884,7 +2884,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", @@ -2942,7 +2942,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 4a51d6d6..0db7b878 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" socket2 = { version = "0.5", features = ["all"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0", features = ["time"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "chore/docker-refs-to-oci", features = ["time"] } strum = { version = "0.26", features = ["derive"] } sys-mount = { version = "3.0", default-features = false } tempfile = "3.12" From 0e3c92bf3b5349868c752f5a2302561f1f4ef489 Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 21 Jan 2025 10:57:54 +0100 Subject: [PATCH 3/6] use patch instead of overriding dependencies --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c8e3e341..9a3726f2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2845,7 +2845,7 @@ dependencies = [ [[package]] name = "stackable-operator" version = "0.84.0" -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?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "chrono", "clap", @@ -2884,7 +2884,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?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "darling", "proc-macro2", @@ -2942,7 +2942,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?branch=chore/docker-refs-to-oci#fc525b5dff25d5ea3fa57e762916f6233dc41879" dependencies = [ "kube", "semver", diff --git a/Cargo.toml b/Cargo.toml index 0db7b878..1bf8775c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" socket2 = { version = "0.5", features = ["all"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "chore/docker-refs-to-oci", features = ["time"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0", features = ["time"] } strum = { version = "0.26", features = ["derive"] } sys-mount = { version = "3.0", default-features = false } tempfile = "3.12" @@ -54,4 +54,4 @@ yasna = "0.5" [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 2aec0373157a00de54fd46dec1de0d81a83f50ea Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 Jan 2025 10:09:21 +0100 Subject: [PATCH 4/6] bump stackable-operator version --- Cargo.lock | 8 ++++---- Cargo.nix | 14 +++++++------- Cargo.toml | 6 +++--- crate-hashes.json | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ab812d06..7aef9d7c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2844,8 +2844,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", @@ -2884,7 +2884,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", @@ -2942,7 +2942,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 655784e4..6decd793 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -9002,13 +9002,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 = [ @@ -9173,8 +9173,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"; @@ -9397,8 +9397,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 d571420f..d07745ed 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -37,7 +37,7 @@ serde_json = "1.0" serde_yaml = "0.9" snafu = "0.8" socket2 = { version = "0.5", features = ["all"] } -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.1", features = ["time"] } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.85.0", features = ["time"] } strum = { version = "0.26", features = ["derive"] } sys-mount = { version = "3.0", default-features = false } tempfile = "3.12" @@ -52,6 +52,6 @@ tracing-subscriber = "0.3" uuid = { version = "1.10.0", features = ["v4"] } yasna = "0.5" -[patch."https://github.com/stackabletech/operator-rs.git"] +# [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 = "chore/docker-refs-to-oci" } 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 From 50c1f547d7941107015de3b9fd974284db41c41a Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 Jan 2025 10:14:08 +0100 Subject: [PATCH 5/6] revert patch section changes --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d07745ed..a0165ab7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,6 +52,6 @@ tracing-subscriber = "0.3" uuid = { version = "1.10.0", features = ["v4"] } yasna = "0.5" -# [patch."https://github.com/stackabletech/operator-rs.git"] +[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 cb20ead10460ea324a636defc793bffe8faf7766 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 Jan 2025 11:02:10 +0100 Subject: [PATCH 6/6] add changelog entry --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b0954a95..076a5a40 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,9 +14,14 @@ All notable changes to this project will be documented in this file. - Made RSA key length configurable for certificates issued by cert-manager ([#528]). - Kerberos principal backends now also provision principals for IP address, not just DNS hostnames ([#552]). +### Changed + +- Default to OCI for image metadata ([#544]). + [#528]: https://github.com/stackabletech/secret-operator/pull/528 [#548]: https://github.com/stackabletech/secret-operator/pull/548 [#552]: https://github.com/stackabletech/secret-operator/pull/552 +[#544]: https://github.com/stackabletech/secret-operator/pull/544 ## [24.11.1] - 2025-01-10