From 860e343d941883dbdbc3ae1cb2b5af14dad78476 Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Fri, 17 Jan 2025 14:10:18 +0100 Subject: [PATCH 1/5] updated deployment values to use Harbor --- deploy/helm/commons-operator/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/helm/commons-operator/values.yaml b/deploy/helm/commons-operator/values.yaml index 12153c1..ffcfaed 100644 --- a/deploy/helm/commons-operator/values.yaml +++ b/deploy/helm/commons-operator/values.yaml @@ -1,7 +1,7 @@ # Default values for commons-operator. --- image: - repository: docker.stackable.tech/stackable/commons-operator + repository: oci.stackable.tech/sdp/commons-operator pullPolicy: IfNotPresent pullSecrets: [] From b7feba3668231eaad7df0264da466a59a1cb2eff Mon Sep 17 00:00:00 2001 From: Andrew Kenworthy Date: Tue, 21 Jan 2025 10:03:29 +0100 Subject: [PATCH 2/5] use draft op-rs branch for oci changes --- Cargo.lock | 6 +++--- Cargo.toml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6f639f7..0e1de80 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2283,7 +2283,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", @@ -2321,7 +2321,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", @@ -2332,7 +2332,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 2246856..a907915 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ futures = { version = "0.3", features = ["compat"] } serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" snafu = "0.8" -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0" } +#stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.84.0" } strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" # [patch."https://github.com/stackabletech/operator-rs.git"] -# 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 d5b3d33b137f61fcb47fe3035f38d837d8053e6c Mon Sep 17 00:00:00 2001 From: xeniape Date: Tue, 28 Jan 2025 08:01:28 +0100 Subject: [PATCH 3/5] uncomment patch section --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9b25742..cddca5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,5 @@ strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -# [patch."https://github.com/stackabletech/operator-rs.git"] -stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "chore/docker-refs-to-oci" } +[patch."https://github.com/stackabletech/operator-rs.git"] +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "chore/docker-refs-to-oci" } From 0bd7647921f2e2b8723edaf3351a3cdc310b7809 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 Jan 2025 08:14:52 +0100 Subject: [PATCH 4/5] 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 be526b6..1b00818 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2282,8 +2282,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", @@ -2321,7 +2321,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", @@ -2332,7 +2332,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 cc5a17c..8d868bd 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -7132,13 +7132,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 = [ @@ -7297,8 +7297,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"; @@ -7332,8 +7332,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 cddca5c..3c044a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,10 +17,10 @@ futures = { version = "0.3", features = ["compat"] } serde = { version = "1.0", features = ["derive"] } serde_json = "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"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -[patch."https://github.com/stackabletech/operator-rs.git"] -stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", branch = "chore/docker-refs-to-oci" } +#[patch."https://github.com/stackabletech/operator-rs.git"] +#stackable-operator = { path = "../operator-rs/crates/stackable-operator" } diff --git a/crate-hashes.json b/crate-hashes.json index a0346dd..290d87f 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 7d06b993ccc08d8d94475edd52097260a43f8f47 Mon Sep 17 00:00:00 2001 From: xeniape Date: Wed, 29 Jan 2025 08:19:04 +0100 Subject: [PATCH 5/5] revert patch section change --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 3c044a6..90a71d4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -22,5 +22,5 @@ strum = { version = "0.26", features = ["derive"] } tokio = { version = "1.40", features = ["full"] } tracing = "0.1" -#[patch."https://github.com/stackabletech/operator-rs.git"] -#stackable-operator = { path = "../operator-rs/crates/stackable-operator" } +# [patch."https://github.com/stackabletech/operator-rs.git"] +# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }