diff --git a/Cargo.lock b/Cargo.lock index 569d542bca..8dc9b75191 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1893,8 +1893,9 @@ dependencies = [ [[package]] name = "linkerd2-proxy-api" -version = "0.10.0" -source = "git+https://github.com/linkerd/linkerd2-proxy-api?rev=f1598b46c179f5a981bfca7b660dc89903b18ab7#f1598b46c179f5a981bfca7b660dc89903b18ab7" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2348745f909668e6de2dbd175eeeac374887ffb33989a0e09766f1807b27cdfe" dependencies = [ "h2", "http", diff --git a/Cargo.toml b/Cargo.toml index 437cc80930..7d7e797707 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -85,4 +85,3 @@ lto = true webpki = { git = "https://github.com/linkerd/webpki", branch = "cert-dns-names-0.22" } boring = { git = "https://github.com/cloudflare/boring" } tokio-boring = { git = "https://github.com/cloudflare/boring" } -linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api", rev = "f1598b46c179f5a981bfca7b660dc89903b18ab7" } diff --git a/linkerd/app/inbound/Cargo.toml b/linkerd/app/inbound/Cargo.toml index 69f93f1ee7..8f74e9635f 100644 --- a/linkerd/app/inbound/Cargo.toml +++ b/linkerd/app/inbound/Cargo.toml @@ -29,7 +29,7 @@ linkerd-meshtls = { path = "../../meshtls", optional = true } linkerd-meshtls-rustls = { path = "../../meshtls/rustls", optional = true } linkerd-proxy-client-policy = { path = "../../proxy/client-policy" } linkerd-tonic-watch = { path = "../../tonic-watch" } -linkerd2-proxy-api = { version = "0.10", features = ["inbound"] } +linkerd2-proxy-api = { version = "0.11", features = ["inbound"] } once_cell = "1" parking_lot = "0.12" rangemap = "1" diff --git a/linkerd/app/integration/Cargo.toml b/linkerd/app/integration/Cargo.toml index 7785de83a8..b75f8fe2b2 100644 --- a/linkerd/app/integration/Cargo.toml +++ b/linkerd/app/integration/Cargo.toml @@ -34,7 +34,7 @@ ipnet = "2" linkerd-app = { path = "..", features = ["allow-loopback"] } linkerd-app-core = { path = "../core" } linkerd-metrics = { path = "../../metrics", features = ["test_util"] } -linkerd2-proxy-api = { version = "0.10", features = [ +linkerd2-proxy-api = { version = "0.11", features = [ "destination", "arbitrary", ] } diff --git a/linkerd/app/outbound/Cargo.toml b/linkerd/app/outbound/Cargo.toml index dc075e5052..d39fa32527 100644 --- a/linkerd/app/outbound/Cargo.toml +++ b/linkerd/app/outbound/Cargo.toml @@ -20,7 +20,7 @@ ahash = "0.8" bytes = "1" http = "0.2" futures = { version = "0.3", default-features = false } -linkerd2-proxy-api = { version = "0.10", features = ["outbound"] } +linkerd2-proxy-api = { version = "0.11", features = ["outbound"] } linkerd-app-core = { path = "../core" } linkerd-app-test = { path = "../test", optional = true } linkerd-distribute = { path = "../../distribute" } diff --git a/linkerd/http-route/Cargo.toml b/linkerd/http-route/Cargo.toml index 614e727baa..3361146e5d 100644 --- a/linkerd/http-route/Cargo.toml +++ b/linkerd/http-route/Cargo.toml @@ -17,7 +17,7 @@ tracing = "0.1" url = "2" [dependencies.linkerd2-proxy-api] -version = "0.10" +version = "0.11" features = ["http-route", "grpc-route"] optional = true diff --git a/linkerd/proxy/api-resolve/Cargo.toml b/linkerd/proxy/api-resolve/Cargo.toml index 5d64a2893d..4045c8bec1 100644 --- a/linkerd/proxy/api-resolve/Cargo.toml +++ b/linkerd/proxy/api-resolve/Cargo.toml @@ -14,7 +14,7 @@ async-stream = "0.3" futures = { version = "0.3", default-features = false } linkerd-addr = { path = "../../addr" } linkerd-error = { path = "../../error" } -linkerd2-proxy-api = { version = "0.10", features = ["destination"] } +linkerd2-proxy-api = { version = "0.11", features = ["destination"] } linkerd-proxy-core = { path = "../core" } linkerd-stack = { path = "../../stack" } linkerd-tls = { path = "../../tls" } diff --git a/linkerd/proxy/client-policy/Cargo.toml b/linkerd/proxy/client-policy/Cargo.toml index 8216131965..28b4a95bf8 100644 --- a/linkerd/proxy/client-policy/Cargo.toml +++ b/linkerd/proxy/client-policy/Cargo.toml @@ -18,7 +18,7 @@ proto = [ ahash = "0.8" ipnet = "2" http = "0.2" -linkerd2-proxy-api = { version = "0.10", optional = true, features = [ +linkerd2-proxy-api = { version = "0.11", optional = true, features = [ "outbound", ] } linkerd-error = { path = "../../error" } diff --git a/linkerd/proxy/identity-client/Cargo.toml b/linkerd/proxy/identity-client/Cargo.toml index f9445eb2b6..bf6b8f04c6 100644 --- a/linkerd/proxy/identity-client/Cargo.toml +++ b/linkerd/proxy/identity-client/Cargo.toml @@ -8,7 +8,7 @@ publish = false [dependencies] futures = { version = "0.3", default-features = false } -linkerd2-proxy-api = { version = "0.10", features = ["identity"] } +linkerd2-proxy-api = { version = "0.11", features = ["identity"] } linkerd-error = { path = "../../error" } linkerd-identity = { path = "../../identity" } linkerd-metrics = { path = "../../metrics" } diff --git a/linkerd/proxy/server-policy/Cargo.toml b/linkerd/proxy/server-policy/Cargo.toml index d5abef9080..d19a7fc65d 100644 --- a/linkerd/proxy/server-policy/Cargo.toml +++ b/linkerd/proxy/server-policy/Cargo.toml @@ -17,7 +17,7 @@ prost-types = { version = "0.11", optional = true } thiserror = "1" [dependencies.linkerd2-proxy-api] -version = "0.10" +version = "0.11" features = ["inbound"] optional = true diff --git a/linkerd/proxy/tap/Cargo.toml b/linkerd/proxy/tap/Cargo.toml index 29a50ed85b..bedaec7813 100644 --- a/linkerd/proxy/tap/Cargo.toml +++ b/linkerd/proxy/tap/Cargo.toml @@ -11,7 +11,7 @@ http = "0.2" hyper = { version = "0.14", features = ["http1", "http2"] } futures = { version = "0.3", default-features = false } ipnet = "2.7" -linkerd2-proxy-api = { version = "0.10", features = ["tap"] } +linkerd2-proxy-api = { version = "0.11", features = ["tap"] } linkerd-conditional = { path = "../../conditional" } linkerd-error = { path = "../../error" } linkerd-meshtls = { path = "../../meshtls" } @@ -30,5 +30,5 @@ tracing = "0.1" pin-project = "1" [dev-dependencies] -linkerd2-proxy-api = { version = "0.10", features = ["arbitrary"] } +linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] } quickcheck = { version = "1", default-features = false } diff --git a/linkerd/service-profiles/Cargo.toml b/linkerd/service-profiles/Cargo.toml index b7e5a221cc..3a81849d89 100644 --- a/linkerd/service-profiles/Cargo.toml +++ b/linkerd/service-profiles/Cargo.toml @@ -21,7 +21,7 @@ linkerd-http-box = { path = "../http-box" } linkerd-proxy-api-resolve = { path = "../proxy/api-resolve" } linkerd-stack = { path = "../stack" } linkerd-tonic-watch = { path = "../tonic-watch" } -linkerd2-proxy-api = { version = "0.10", features = ["destination"] } +linkerd2-proxy-api = { version = "0.11", features = ["destination"] } once_cell = "1.17" prost-types = "0.11" regex = "1" @@ -33,5 +33,5 @@ thiserror = "1" tracing = "0.1" [dev-dependencies] -linkerd2-proxy-api = { version = "0.10", features = ["arbitrary"] } +linkerd2-proxy-api = { version = "0.11", features = ["arbitrary"] } quickcheck = { version = "1", default-features = false }