Skip to content

Commit 45780d0

Browse files
authored
refactor: kubert-prometheus-* crates are workspace dependencies (#4580)
this commit performs a small organizational tweak to our package manifests. we have some dependencies upon crates from the `kubert` workspace. this prepares us for a switch over to our `linkerd-kubert` fork [here](https://github.com/linkerd/linkerd-kubert) by simplifying the task of using `[patch.crates-io]` to override these dependencies or of redefining these to use a git-based dependency. Signed-off-by: katelyn martin <kate@buoyant.io>
1 parent 8da700c commit 45780d0

3 files changed

Lines changed: 10 additions & 2 deletions

File tree

Cargo.toml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,14 @@ version = "0.1"
136136
default-features = false
137137
features = ["tokio", "tracing"]
138138

139+
[workspace.dependencies.kubert-prometheus-process]
140+
version = "0.2.0"
141+
default-features = false
142+
143+
[workspace.dependencies.kubert-prometheus-tokio]
144+
version = "0.2.0"
145+
default-features = false
146+
139147
[workspace.dependencies.linkerd2-proxy-api]
140148
version = "0.20.0"
141149

linkerd/metrics/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ bytes = { workspace = true }
1717
deflate = { version = "1", features = ["gzip"] }
1818
http = { workspace = true }
1919
http-body-util = { workspace = true }
20-
kubert-prometheus-process = { version = "0.2", optional = true }
20+
kubert-prometheus-process = { workspace = true, optional = true }
2121
parking_lot = "0.12"
2222
prometheus-client = { workspace = true }
2323
tokio = { version = "1", features = ["time"] }

linkerd2-proxy/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jemalloc-profiling = [
2020

2121
[dependencies]
2222
futures = { version = "0.3", default-features = false }
23-
kubert-prometheus-tokio = { version = "0.2.0", features = ["rt"] }
23+
kubert-prometheus-tokio = { workspace = true, features = ["rt"] }
2424
linkerd-app = { path = "../linkerd/app" }
2525
linkerd-metrics = { path = "../linkerd/metrics" }
2626
linkerd-rustls = { path = "../linkerd/rustls" }

0 commit comments

Comments
 (0)