Skip to content

chore(deps): sort and organize dependencies #13969

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(deps): sort and organize dependencies #13969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,34 @@ lto = "thin"
gateway-api = "0.15"
http = "1"
hyper = "1"
hyper-util = { version = "0.1", default-features = false, features = ["tracing"] }
k8s-openapi = { version = "0.24", features = ["v1_32"] }
kube = { version = "0.99", default-features = false }
kubert = { version = "0.24", default-features = false }
prometheus-client = { version = "0.23", default-features = false }
tonic = { version = "0.12", default-features = false }
tower = { version = "0.5", default-features = false }

linkerd-policy-controller = { path = "./policy-controller" }
linkerd-policy-controller-core = { path = "./policy-controller/core" }
linkerd-policy-controller-grpc = { path = "./policy-controller/grpc" }
linkerd-policy-controller-k8s-api = { path = "./policy-controller/k8s/api" }
linkerd-policy-test = { path = "./policy-test" }

[workspace.dependencies.hyper-util]
version = "0.1"
default-features = false
features = ["tracing"]

[workspace.dependencies.linkerd-policy-controller-k8s-index]
path = "./policy-controller/k8s/index"

[workspace.dependencies.linkerd-policy-controller-k8s-status]
path = "./policy-controller/k8s/status"

[workspace.dependencies.linkerd-policy-controller-runtime]
path = "./policy-controller/runtime"
default-features = false

[workspace.dependencies.linkerd2-proxy-api]
version = "0.16.0"
features = ["inbound", "outbound"]
4 changes: 3 additions & 1 deletion policy-controller/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ openssl-vendored = ["linkerd-policy-controller-runtime/openssl-vendored"]
anyhow = "1"
tokio = { version = "1", features = ["macros", "rt", "rt-multi-thread"] }

linkerd-policy-controller-runtime = { path = "./runtime", default-features = false }
[dependencies.linkerd-policy-controller-runtime]
workspace = true
default-features = false

[target.x86_64-unknown-linux-gnu.dependencies]
jemallocator = "0.5"
9 changes: 5 additions & 4 deletions policy-controller/grpc/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,19 @@ publish = false
[dependencies]
async-stream = "0.3"
async-trait = "0.1"
http = { workspace = true }
drain = "0.2"
futures = { version = "0.3", default-features = false }
http = { workspace = true }
hyper = { workspace = true, features = ["http2", "server"] }
linkerd-policy-controller-core = { path = "../core" }
maplit = "1"
prost-types = "0.13"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["macros"] }
tonic = { workspace = true }
tracing = "0.1"
serde = { version = "1", features = ["derive"] }
serde_json = "1"

linkerd-policy-controller-core = { workspace = true }

[dependencies.linkerd2-proxy-api]
workspace = true
Expand Down
16 changes: 10 additions & 6 deletions policy-controller/k8s/api/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,22 @@ license = "Apache-2.0"
publish = false

[dependencies]
k8s-openapi = { workspace = true }
gateway-api = { workspace = true }
kube = { workspace = true, default-features = false, features = [
"client",
"derive",
"runtime",
] }
ipnet = { version = "2.11", features = ["json"] }
k8s-openapi = { workspace = true }
schemars = "0.8"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
serde_yaml = "0.9"
thiserror = "2"
tokio = { version = "1", features = ["time"] }
tracing = "0.1"

[dependencies.kube]
workspace = true
default-features = false
features = [
"client",
"derive",
"runtime",
]
19 changes: 12 additions & 7 deletions policy-controller/k8s/index/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,25 @@ anyhow = "1"
chrono = { version = "0.4.41", default-features = false }
futures = { version = "0.3", default-features = false }
http = { workspace = true }
kube = { workspace = true, default-features = false, features = [
"client",
"derive",
"runtime",
] }
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 = { workspace = true, default-features = false }
thiserror = "2"
tokio = { version = "1", features = ["macros", "rt", "sync"] }
tracing = "0.1"

linkerd-policy-controller-core = { workspace = true }
linkerd-policy-controller-k8s-api = { workspace = true }

[dependencies.kube]
workspace = true
default-features = false
features = [
"client",
"derive",
"runtime",
]

[dev-dependencies]
chrono = { version = "0.4", default-features = false }
k8s-openapi = { workspace = true, features = ["schemars"] }
Expand Down
17 changes: 11 additions & 6 deletions policy-controller/k8s/status/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,6 @@ ahash = "0.8"
anyhow = "1"
# Fix for https://github.com/chronotope/chrono/issues/602
chrono = { version = "0.4.41", default-features = false, features = ["clock"] }
kubert = { workspace = true, default-features = false, features = [
"index",
"lease",
] }
linkerd-policy-controller-core = { path = "../../core" }
linkerd-policy-controller-k8s-api = { path = "../api" }
parking_lot = "0.12"
prometheus-client = { workspace = true }
serde = "1"
Expand All @@ -24,6 +18,17 @@ thiserror = "2"
tokio = { version = "1", features = ["macros"] }
tracing = "0.1.41"

linkerd-policy-controller-core = { workspace = true }
linkerd-policy-controller-k8s-api = { workspace = true }

[dependencies.kubert]
workspace = true
default-features = false
features = [
"index",
"lease",
]

[dev-dependencies.tokio]
version = "1"
features = ["macros"]
14 changes: 7 additions & 7 deletions policy-controller/runtime/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ async-trait = "0.1"
bytes = "1"
drain = "0.2"
futures = { version = "0.3", default-features = false }
k8s-openapi = { workspace = true }
http-body-util = "0.1"
hyper = { workspace = true, features = ["http1", "http2", "server"] }
hyper-util = { workspace = true }
ipnet = { version = "2", default-features = false }
k8s-openapi = { workspace = true }
openssl = { version = "0.10.72", optional = true }
parking_lot = "0.12"
prometheus-client = { workspace = true }
regex = "1"
serde = "1"
serde_json = "1"
thiserror = "2"
tokio-stream = { version = "0.1", features = ["sync"] }
tower = { workspace = true }
tracing = "0.1"
regex = "1"

linkerd-policy-controller-core = { path = "../core" }
linkerd-policy-controller-grpc = { path = "../grpc" }
linkerd-policy-controller-k8s-api = { path = "../k8s/api" }
linkerd-policy-controller-k8s-index = { path = "../k8s/index" }
linkerd-policy-controller-k8s-status = { path = "../k8s/status" }
linkerd-policy-controller-core = { workspace = true }
linkerd-policy-controller-grpc = { workspace = true }
linkerd-policy-controller-k8s-api = { workspace = true }
linkerd-policy-controller-k8s-index = { workspace = true }
linkerd-policy-controller-k8s-status = { workspace = true }

[dependencies.clap]
version = "4"
Expand Down
7 changes: 4 additions & 3 deletions policy-test/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,6 @@ hyper-util = { workspace = true }
futures = { version = "0.3", default-features = false }
ipnet = "2"
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" }
maplit = "1"
rand = "0.9"
serde = "1"
Expand All @@ -32,6 +29,10 @@ tower = { workspace = true }
tracing = "0.1"
tracing-subscriber = { version = "0.3", features = ["env-filter"] }

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" }

[dependencies.kube]
workspace = true
default-features = false
Expand Down