temporary dependency override on linkerd2-proxy-api to pick changes f…

…rom linkerd/linkerd2-proxy-api#388
linkerd · Oct 31, 2024 · c42858e · c42858e
1 parent 7328ad3
commit c42858e
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -1325,7 +1325,7 @@ dependencies = [
 [[package]]
 name = "linkerd2-proxy-api"
 version = "0.14.0"
-source = "git+https://github.com/linkerd/linkerd2-proxy-api?rev=c5648ae2a1e405cc6b8aca20522356ebdf20f1ea#c5648ae2a1e405cc6b8aca20522356ebdf20f1ea"
+source = "git+https://github.com/linkerd/linkerd2-proxy-api.git?branch=alpeb/rate-limiting#4e5a650e99d0086149917ead8deb8d0d7cc93924"
 dependencies = [
  "http",
  "ipnet",

diff --git a/Cargo.toml b/Cargo.toml
@@ -14,5 +14,4 @@ members = [
 lto = "thin"
 
 [patch.crates-io]
-# TODO(Zahari): switch released version once TLS protocol support is out.
-linkerd2-proxy-api = { git = 'https://github.com/linkerd/linkerd2-proxy-api', rev = 'c5648ae2a1e405cc6b8aca20522356ebdf20f1ea' }
+linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "alpeb/rate-limiting" }
diff --git a/go.mod b/go.mod
@@ -165,3 +165,5 @@ require (
 	sigs.k8s.io/kustomize/kyaml v0.17.1 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
 )
+
+replace github.com/linkerd/linkerd2-proxy-api => github.com/linkerd/linkerd2-proxy-api v0.14.1-0.20241030171301-4e5a650e99d0
diff --git a/go.sum b/go.sum
@@ -291,8 +291,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
 github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
-github.com/linkerd/linkerd2-proxy-api v0.14.0 h1:gSMKSFzA43yyut6DOHFbGWggNgqIuFz90Y3+Ox17v/8=
-github.com/linkerd/linkerd2-proxy-api v0.14.0/go.mod h1:ElmA+VVHurWqjtcEcKApJ9dbox76Aeo8lUPpJ6wWMu4=
+github.com/linkerd/linkerd2-proxy-api v0.14.1-0.20241030171301-4e5a650e99d0 h1:36rb06gLHSN6hHTJcRL2ir4f3ukm3sqUiXjwexkE9Zk=
+github.com/linkerd/linkerd2-proxy-api v0.14.1-0.20241030171301-4e5a650e99d0/go.mod h1:gV0wEXbhnurC6HQPEI9Ea1f4gTfVXEJYC6MPVM21Xs8=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=