linkerd
/
linkerd2
mirror of https://github.com/linkerd/linkerd2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore(cargo): use workspace dependencies for kube and hyper (#13672) 

In preparation of an upcoming dependency bump, this change updates our Cargo
workspace to use workspace dependencies.
This commit is contained in:
Oliver Gould 2025-02-17 14:44:54 -08:00 committed by GitHub
parent c6e77598ab
commit 1c23be1260
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
8 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Cargo.toml
View File

@ -15,6 +15,21 @@ members = [
lto = "thin"
[workspace.dependencies]
http = "0.2"
hyper = { version = "0.14" }
k8s-openapi = { version = "0.20", features = ["v1_22"] }
kube = { version = "0.87.1", default-features = false }
kubert = { version = "0.22", default-features = false }
prometheus-client = { version = "0.22", default-features = false }
tonic = { version = "0.10", default-features = false }
[workspace.dependencies.k8s-gateway-api]
version = "0.16"
features = ["experimental"]
[workspace.dependencies.linkerd2-proxy-api]
version = "0.15"
features = [
"inbound",
"outbound",
]

2
policy-controller/core/Cargo.toml
View File

@ -11,6 +11,6 @@ anyhow = "1"
async-trait = "0.1"
chrono = { version = "0.4.39", default-features = false }
futures = { version = "0.3", default-features = false, features = ["std"] }
http = "0.2"
http = { workspace = true }
ipnet = "2"
regex = "1"

8
policy-controller/grpc/Cargo.toml
View File

@ -8,19 +8,19 @@ publish = false
[dependencies]
async-stream = "0.3"
async-trait = "0.1"
http = "0.2"
http = { workspace = true }
drain = "0.1"
futures = { version = "0.3", default-features = false }
hyper = { version = "0.14", features = ["http2", "server", "tcp"] }
hyper = { workspace = true, features = ["http2", "server", "tcp"] }
linkerd-policy-controller-core = { path = "../core" }
maplit = "1"
prost-types = "0.12.6"
tokio = { version = "1", features = ["macros"] }
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true }
tracing = "0.1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
[dependencies.linkerd2-proxy-api]
version = "0.15"
workspace = true
features = ["inbound", "outbound"]

2
policy-controller/k8s/api/Cargo.toml
View File

@ -7,7 +7,7 @@ publish = false
[dependencies]
k8s-openapi = { workspace = true }
k8s-gateway-api = { version = "0.16", features = ["experimental"] }
k8s-gateway-api = { workspace = true, features = ["experimental"] }
kube = { workspace = true, default-features = false, features = [
"client",
"derive",

6
policy-controller/k8s/index/Cargo.toml
View File

@ -10,7 +10,7 @@ ahash = "0.8"
anyhow = "1"
chrono = { version = "0.4.39", default-features = false }
futures = { version = "0.3", default-features = false }
http = "0.2"
http = { workspace = true }
kube = { workspace = true, default-features = false, features = [
"client",
"derive",
@ -20,14 +20,14 @@ 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"
prometheus-client = { version = "0.22.3", default-features = false }
prometheus-client = { workspace = true, default-features = false }
thiserror = "2"
tokio = { version = "1", features = ["macros", "rt", "sync"] }
tracing = "0.1"
[dev-dependencies]
chrono = { version = "0.4", default-features = false }
k8s-openapi = { version = "0.20", features = ["schemars"] }
k8s-openapi = { workspace = true, features = ["schemars"] }
maplit = "1"
tokio-stream = "0.1"
tokio-test = "0.4"

2
policy-controller/k8s/status/Cargo.toml
View File

@ -17,7 +17,7 @@ kubert = { workspace = true, default-features = false, features = [
linkerd-policy-controller-core = { path = "../../core" }
linkerd-policy-controller-k8s-api = { path = "../api" }
parking_lot = "0.12"
prometheus-client = { version = "0.22.3", default-features = false }
prometheus-client = { workspace = true, default-features = false }
serde = "1"
serde_json = "1.0.138"
thiserror = "2"

6
policy-controller/runtime/Cargo.toml
View File

@ -19,11 +19,11 @@ async-trait = "0.1"
drain = "0.1"
futures = { version = "0.3", default-features = false }
k8s-openapi = { workspace = true }
hyper = { version = "0.14", features = ["http1", "http2", "runtime", "server"] }
hyper = { workspace = true, features = ["http1", "http2", "runtime", "server"] }
ipnet = { version = "2", default-features = false }
openssl = { version = "0.10.71", optional = true }
parking_lot = "0.12"
prometheus-client = { version = "0.22.3", default-features = false }
prometheus-client = { workspace = true, default-features = false }
serde = "1"
serde_json = "1"
thiserror = "2"
@ -65,6 +65,6 @@ version = "1"
features = ["macros", "parking_lot", "rt", "rt-multi-thread", "signal"]
[dependencies.tonic]
version = "0.10"
workspace = true
default-features = false
features = ["transport"]

8
policy-test/Cargo.toml
View File

@ -7,10 +7,10 @@ publish = false
[dependencies]
anyhow = "1"
hyper = { version = "0.14", features = ["client", "http2"] }
hyper = { workspace = true, features = ["client", "http2"] }
futures = { version = "0.3", default-features = false }
ipnet = "2"
k8s-gateway-api = "0.16"
k8s-gateway-api = { workspace = true }
k8s-openapi = { workspace = true }
linkerd-policy-controller-core = { path = "../policy-controller/core" }
linkerd-policy-controller-k8s-api = { path = "../policy-controller/k8s/api" }
@ -20,7 +20,7 @@ rand = "0.9"
serde = "1"
serde_json = "1"
schemars = "0.8"
tonic = { version = "0.10", default-features = false }
tonic = { workspace = true }
tokio = { version = "1", features = ["macros", "rt"] }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
@ -31,7 +31,7 @@ default-features = false
features = ["client", "openssl-tls", "runtime", "ws"]
[dependencies.linkerd2-proxy-api]
version = "0.15"
workspace = true
features = ["inbound", "outbound"]
[dev-dependencies]