Skip to content

Commit 5d78e3f

Browse files
authored
refactor(deps): use linkerd-kubert git dependencies (#4583)
see <https://github.com/linkerd/linkerd-kubert>. we now have a fork of the kubert library. at the time of writing, this is a 1:1 fork with no additional changes included. soon, we will introduce some additional changes so that we can (1) pull in changes like linkerd/linkerd-kubert@b27f147 that migrate away from abandoned dependencies, and (2) update dependencies so that we can update our gateway api bindings. as an initial step towards this tasks, we alter the dependencies upon `kubert-prometheus-process` and `kubert-prometheus-tokio` so that they point to our git repository. NB: this commit does not pull in any new code. we depend upon kubert-prometheus-process v0.2.3, and kubert-prometheus-tokio v0.2.0, and we use those exact tags here as well. new changes will be pulled in within a forthcoming commit after we land this. Signed-off-by: katelyn martin <kate@buoyant.io>
1 parent 1a8a1dc commit 5d78e3f

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

Cargo.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1416,8 +1416,7 @@ checksum = "a4933f3f57a8e9d9da04db23fb153356ecaf00cbd14aee46279c33dc80925c37"
14161416
[[package]]
14171417
name = "kubert-prometheus-process"
14181418
version = "0.2.3"
1419-
source = "registry+https://github.com/rust-lang/crates.io-index"
1420-
checksum = "5b89e2a641a3f74c2e7366eb050282ac4a6194b63dae5294084215c457237e47"
1419+
source = "git+https://github.com/linkerd/linkerd-kubert.git?tag=kubert-prometheus-process%2Fv0.2.3#13e7733aad0a2db233592ed4c1341c55d9ec2dea"
14211420
dependencies = [
14221421
"libc",
14231422
"procfs",
@@ -1428,8 +1427,7 @@ dependencies = [
14281427
[[package]]
14291428
name = "kubert-prometheus-tokio"
14301429
version = "0.2.0"
1431-
source = "registry+https://github.com/rust-lang/crates.io-index"
1432-
checksum = "639670482534c37eb44caf6f4b72cc5da2f2c06aed39d1fb0cba940569428212"
1430+
source = "git+https://github.com/linkerd/linkerd-kubert.git?tag=kubert-prometheus-tokio%2Fv0.2.0#acd081cce5fb85ec745a5e793ab09adf421f8b4f"
14331431
dependencies = [
14341432
"prometheus-client",
14351433
"tokio",

Cargo.toml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,16 @@ default-features = false
137137
features = ["tokio", "tracing"]
138138

139139
[workspace.dependencies.kubert-prometheus-process]
140-
version = "0.2.0"
140+
version = "0.2"
141141
default-features = false
142+
git = "https://github.com/linkerd/linkerd-kubert.git"
143+
tag = "kubert-prometheus-process/v0.2.3"
142144

143145
[workspace.dependencies.kubert-prometheus-tokio]
144146
version = "0.2.0"
145147
default-features = false
148+
git = "https://github.com/linkerd/linkerd-kubert.git"
149+
tag = "kubert-prometheus-tokio/v0.2.0"
146150

147151
[workspace.dependencies.linkerd2-proxy-api]
148152
version = "0.20.0"

deny.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,3 +66,7 @@ unknown-git = "deny"
6666
allow-registry = [
6767
"https://github.com/rust-lang/crates.io-index",
6868
]
69+
allow-git = [
70+
# We accept a git dependency upon linkerd-kubert.
71+
"https://github.com/linkerd/linkerd-kubert.git"
72+
]

0 commit comments

Comments
 (0)