Skip to content

Commit

Permalink
build(deps): bump kubert from 0.21.2 to 0.22.0 (#13399)
Browse files Browse the repository at this point in the history
This change introduces a timeout into the kubernetes lease logic so that patches
may not get stuck indefinitely.

This change also modifies our Cargo.tomls so that kubert and its related
dependencies (kube and k8s-openapi) are defined at the workspace-level.
  • Loading branch information
olix0r authored Nov 26, 2024
1 parent 0d2e0ce commit 43335fd
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1080,9 +1080,9 @@ dependencies = [

[[package]]
name = "kubert"
version = "0.21.2"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "023388cc940f58816aa0d758a3fd4c4b837474ccd356803b7ac738b8a2f26a66"
checksum = "3ff4135c85607c3733cd52e3098df704994980a91cb14afabd967a60cb167433"
dependencies = [
"ahash",
"backoff",
Expand Down
5 changes: 5 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,8 @@ members = [

[profile.release]
lto = "thin"

[workspace.dependencies]
k8s-openapi = { version = "0.20", features = ["v1_22"] }
kube = { version = "0.87.1", default-features = false }
kubert = { version = "0.22", default-features = false }
6 changes: 3 additions & 3 deletions policy-controller/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ anyhow = "1"
async-trait = "0.1"
drain = "0.1"
futures = { version = "0.3", default-features = false }
k8s-openapi = { version = "0.20", features = ["v1_22"] }
k8s-openapi = { workspace = true }
hyper = { version = "0.14", features = ["http1", "http2", "runtime", "server"] }
ipnet = { version = "2", default-features = false }
linkerd-policy-controller-core = { path = "./core" }
Expand All @@ -41,12 +41,12 @@ default-features = false
features = ["derive", "env", "std"]

[dependencies.kube]
version = "0.87.1"
workspace = true
default-features = false
features = ["admission", "derive"]

[dependencies.kubert]
version = "0.21.2"
workspace = true
default-features = false
features = [
"clap",
Expand Down
6 changes: 2 additions & 4 deletions policy-controller/k8s/api/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,9 @@ license = "Apache-2.0"
publish = false

[dependencies]
k8s-openapi = { version = "0.20", default-features = false, features = [
"v1_22",
] }
k8s-openapi = { workspace = true }
k8s-gateway-api = { version = "0.16", features = ["experimental"] }
kube = { version = "0.87.1", default-features = false, features = [
kube = { workspace = true, default-features = false, features = [
"client",
"derive",
"runtime",
Expand Down
4 changes: 2 additions & 2 deletions policy-controller/k8s/index/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ anyhow = "1"
chrono = { version = "0.4.38", default_features = false }
futures = { version = "0.3", default-features = false }
http = "0.2"
kube = { version = "0.87.1", default-features = false, features = [
kube = { workspace = true, default-features = false, features = [
"client",
"derive",
"runtime",
] }
kubert = { version = "0.21.2", default-features = false, features = ["index"] }
kubert = { workspace = true, default-features = false, features = ["index"] }
linkerd-policy-controller-core = { path = "../../core" }
linkerd-policy-controller-k8s-api = { path = "../api" }
parking_lot = "0.12"
Expand Down
2 changes: 1 addition & 1 deletion policy-controller/k8s/status/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ahash = "0.8"
anyhow = "1"
# Fix for https://github.com/chronotope/chrono/issues/602
chrono = { version = "0.4.38", default-features = false, features = ["clock"] }
kubert = { version = "0.21.2", default-features = false, features = [
kubert = { workspace = true, default-features = false, features = [
"index",
"lease",
] }
Expand Down
4 changes: 2 additions & 2 deletions policy-test/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ hyper = { version = "0.14", features = ["client", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2"
k8s-gateway-api = "0.16"
k8s-openapi = { version = "0.20", features = ["v1_22"] }
k8s-openapi = { workspace = true }
linkerd-policy-controller-core = { path = "../policy-controller/core" }
linkerd-policy-controller-k8s-api = { path = "../policy-controller/k8s/api" }
linkerd-policy-controller-grpc = { path = "../policy-controller/grpc" }
Expand All @@ -26,7 +26,7 @@ tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

[dependencies.kube]
version = "0.87.1"
workspace = true
default-features = false
features = ["client", "openssl-tls", "runtime", "ws"]

Expand Down

0 comments on commit 43335fd

Please sign in to comment.