From 0b51e318fdc6d4df8b98f4336f9fe20b6b440449 Mon Sep 17 00:00:00 2001
From: xeniape <xenia.fischer@stackable.tech>
Date: Wed, 19 Mar 2025 17:18:54 +0100
Subject: [PATCH 1/2] chore: Bump stackable-operator to 0.87.5
---
Cargo.lock | 17 +++++++++--------
Cargo.nix | 43 ++++++++++++++++++++++++-------------------
Cargo.toml | 4 ++--
crate-hashes.json | 6 +++---
4 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 2456ca6c..4e065f48 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -169,9 +169,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
[[package]]
name = "backon"
-version = "1.4.0"
+version = "1.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49fef586913a57ff189f25c9b3d034356a5bf6b3fa9a7f067588fe1698ba1f5d"
+checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7"
dependencies = [
"fastrand",
"gloo-timers",
@@ -1952,6 +1952,7 @@ checksum = "822ee9188ac4ec04a2f0531e55d035fb2de73f18b41a63c70c2712503b6fb13c"
dependencies = [
"log",
"once_cell",
+ "ring",
"rustls-pki-types",
"rustls-webpki",
"subtle",
@@ -2299,8 +2300,8 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
[[package]]
name = "stackable-operator"
-version = "0.87.4"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+version = "0.87.5"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#f035997fca85a54238c8de895389cc50b4d421e2"
dependencies = [
"chrono",
"clap",
@@ -2338,7 +2339,7 @@ dependencies = [
[[package]]
name = "stackable-operator-derive"
version = "0.3.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#f035997fca85a54238c8de895389cc50b4d421e2"
dependencies = [
"darling",
"proc-macro2",
@@ -2349,7 +2350,7 @@ dependencies = [
[[package]]
name = "stackable-shared"
version = "0.0.1"
-source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d"
+source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#f035997fca85a54238c8de895389cc50b4d421e2"
dependencies = [
"kube",
"semver",
@@ -3048,9 +3049,9 @@ dependencies = [
[[package]]
name = "windows-link"
-version = "0.1.0"
+version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
+checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
[[package]]
name = "windows-sys"
diff --git a/Cargo.nix b/Cargo.nix
index 8ff5a4e3..039cd6c3 100644
--- a/Cargo.nix
+++ b/Cargo.nix
@@ -501,9 +501,9 @@ rec {
};
"backon" = rec {
crateName = "backon";
- version = "1.4.0";
+ version = "1.4.1";
edition = "2021";
- sha256 = "0p8zpac1dzl8fl37z6psngv5nsim6k8b7j95kwcgymrsj63gbzj9";
+ sha256 = "1drv0gvhjs3g0q88f1mknqjdyhh6qg8pvb9nkfasba011ibr23cp";
dependencies = [
{
name = "fastrand";
@@ -2928,7 +2928,7 @@ rec {
"webpki-roots" = [ "dep:webpki-roots" ];
"webpki-tokio" = [ "webpki-roots" ];
};
- resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "rustls-native-certs" "tls12" ];
+ resolvedDefaultFeatures = [ "http1" "log" "logging" "native-tokio" "ring" "rustls-native-certs" "tls12" ];
};
"hyper-timeout" = rec {
crateName = "hyper-timeout";
@@ -4043,7 +4043,7 @@ rec {
"webpki-roots" = [ "kube-client/webpki-roots" "client" ];
"ws" = [ "kube-client/ws" "kube-core/ws" ];
};
- resolvedDefaultFeatures = [ "client" "config" "derive" "jsonpatch" "kube-client" "kube-derive" "kube-runtime" "runtime" "rustls-tls" ];
+ resolvedDefaultFeatures = [ "client" "config" "derive" "jsonpatch" "kube-client" "kube-derive" "kube-runtime" "ring" "runtime" "rustls-tls" ];
};
"kube-client" = rec {
crateName = "kube-client";
@@ -4284,7 +4284,7 @@ rec {
"webpki-roots" = [ "hyper-rustls/webpki-roots" ];
"ws" = [ "client" "tokio-tungstenite" "kube-core/ws" "tokio/macros" ];
};
- resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "rustls" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ];
+ resolvedDefaultFeatures = [ "__non_core" "base64" "bytes" "chrono" "client" "config" "either" "futures" "home" "http-body" "http-body-util" "hyper" "hyper-rustls" "hyper-timeout" "hyper-util" "jsonpatch" "jsonpath-rust" "pem" "ring" "rustls" "rustls-tls" "serde_yaml" "tokio" "tokio-util" "tower" "tower-http" "tracing" ];
};
"kube-core" = rec {
crateName = "kube-core";
@@ -6121,7 +6121,7 @@ rec {
"std" = [ "alloc" ];
"wasm32_unknown_unknown_js" = [ "getrandom/js" ];
};
- resolvedDefaultFeatures = [ "alloc" ];
+ resolvedDefaultFeatures = [ "alloc" "default" "dev_urandom_fallback" ];
};
"rustc-demangle" = rec {
crateName = "rustc-demangle";
@@ -6155,6 +6155,11 @@ rec {
usesDefaultFeatures = false;
features = [ "alloc" "race" ];
}
+ {
+ name = "ring";
+ packageId = "ring";
+ optional = true;
+ }
{
name = "rustls-pki-types";
packageId = "rustls-pki-types";
@@ -6200,7 +6205,7 @@ rec {
"std" = [ "webpki/std" "pki-types/std" "once_cell/std" ];
"zlib" = [ "dep:zlib-rs" ];
};
- resolvedDefaultFeatures = [ "log" "logging" "std" "tls12" ];
+ resolvedDefaultFeatures = [ "log" "logging" "ring" "std" "tls12" ];
};
"rustls-native-certs 0.7.3" = rec {
crateName = "rustls-native-certs";
@@ -6332,7 +6337,7 @@ rec {
"ring" = [ "dep:ring" ];
"std" = [ "alloc" "pki-types/std" ];
};
- resolvedDefaultFeatures = [ "alloc" "std" ];
+ resolvedDefaultFeatures = [ "alloc" "ring" "std" ];
};
"rustversion" = rec {
crateName = "rustversion";
@@ -7182,13 +7187,13 @@ rec {
};
"stackable-operator" = rec {
crateName = "stackable-operator";
- version = "0.87.4";
+ version = "0.87.5";
edition = "2021";
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/stackabletech/operator-rs.git";
- rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
- sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+ rev = "f035997fca85a54238c8de895389cc50b4d421e2";
+ sha256 = "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij";
};
libName = "stackable_operator";
authors = [
@@ -7249,7 +7254,7 @@ rec {
name = "kube";
packageId = "kube";
usesDefaultFeatures = false;
- features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" ];
+ features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" "ring" ];
}
{
name = "opentelemetry-jaeger";
@@ -7347,8 +7352,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/stackabletech/operator-rs.git";
- rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
- sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+ rev = "f035997fca85a54238c8de895389cc50b4d421e2";
+ sha256 = "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij";
};
procMacro = true;
libName = "stackable_operator_derive";
@@ -7382,8 +7387,8 @@ rec {
workspace_member = null;
src = pkgs.fetchgit {
url = "https://github.com/stackabletech/operator-rs.git";
- rev = "a6d8db57a3108a4fb12eb82f9f7941f55ae2c88d";
- sha256 = "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb";
+ rev = "f035997fca85a54238c8de895389cc50b4d421e2";
+ sha256 = "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij";
};
libName = "stackable_shared";
authors = [
@@ -7394,7 +7399,7 @@ rec {
name = "kube";
packageId = "kube";
usesDefaultFeatures = false;
- features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" ];
+ features = [ "client" "jsonpatch" "runtime" "derive" "rustls-tls" "ring" ];
}
{
name = "semver";
@@ -10307,9 +10312,9 @@ rec {
};
"windows-link" = rec {
crateName = "windows-link";
- version = "0.1.0";
+ version = "0.1.1";
edition = "2021";
- sha256 = "1qr0srnkw148wbrws3726pm640h2vxgcdlxn0cxpbcg27irzvk3d";
+ sha256 = "0f2cq7imbrppsmmnz8899hfhg07cp5gq6rh0bjhb1qb6nwshk13n";
libName = "windows_link";
authors = [
"Microsoft"
diff --git a/Cargo.toml b/Cargo.toml
index c161d346..be207fc4 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.87.4" }
+stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "stackable-operator-0.87.5" }
stackable-versioned = { git = "https://github.com/stackabletech/operator-rs.git", features = ["k8s"], tag = "stackable-versioned-0.7.0" }
product-config = { git = "https://github.com/stackabletech/product-config.git", tag = "0.7.0" }
strum = { version = "0.27", features = ["derive"] }
@@ -31,7 +31,7 @@ tokio = { version = "1.40", features = ["full"] }
tokio-zookeeper = "0.4"
tracing = "0.1"
-#[patch."https://github.com/stackabletech/operator-rs"]
+# [patch."https://github.com/stackabletech/operator-rs"]
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
[patch.crates-io]
diff --git a/crate-hashes.json b/crate-hashes.json
index 8a3738aa..7f61266a 100644
--- a/crate-hashes.json
+++ b/crate-hashes.json
@@ -1,7 +1,7 @@
{
- "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-operator-derive@0.3.1": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
- "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-operator@0.87.4": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
- "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.4#stackable-shared@0.0.1": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
+ "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#stackable-operator-derive@0.3.1": "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij",
+ "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#stackable-operator@0.87.5": "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij",
+ "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.87.5#stackable-shared@0.0.1": "0p6v8ay9vdz8070ryirr4fb1l52da82l8jkzy8mzvm8g8436f0ij",
"git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#k8s-version@0.1.2": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
"git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#stackable-versioned-macros@0.7.0": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
"git+https://github.com/stackabletech/operator-rs.git?tag=stackable-versioned-0.7.0#stackable-versioned@0.7.0": "1val6arh6mq2x9292ppf0nd8s7hw6nwby85qh50dsimwqw3hcpcb",
From 7bf263687d364c02750f16fc588bc98343afa9a3 Mon Sep 17 00:00:00 2001
From: Nick <10092581+NickLarsenNZ@users.noreply.github.com>
Date: Thu, 20 Mar 2025 09:10:05 +0100
Subject: [PATCH 2/2] Apply suggestions from code review
---
Cargo.toml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Cargo.toml b/Cargo.toml
index be207fc4..ba02cb31 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -31,7 +31,7 @@ tokio = { version = "1.40", features = ["full"] }
tokio-zookeeper = "0.4"
tracing = "0.1"
-# [patch."https://github.com/stackabletech/operator-rs"]
+#[patch."https://github.com/stackabletech/operator-rs"]
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
[patch.crates-io]