From 6a5e5779724762bccde7f3012c1dc64ef9d97ae1 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Fri, 8 Nov 2024 15:12:39 +0000 Subject: [PATCH] build(deps): temporarily pin linkerd2-proxy-api to main In order to validate changes end-to-end before tagging a new proxy-api release, this change updates the proxy API to linkerd2-proxy-api@main#6c316cc. --- Cargo.lock | 2 +- Cargo.toml | 2 +- go.mod | 3 +++ go.sum | 4 ++-- policy-controller/grpc/src/inbound.rs | 3 +++ policy-test/src/grpc.rs | 4 ++++ 6 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 442765ce29c82..f7b7e2d258f89 100644 --- 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?branch=main#6c316cc41a3a0e194a70f22b5698ec21ce245e99" dependencies = [ "http", "ipnet", diff --git a/Cargo.toml b/Cargo.toml index 9ba219c0c9972..03f7db5ad8371 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,4 +15,4 @@ 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' } \ No newline at end of file +linkerd2-proxy-api = { git = 'https://github.com/linkerd/linkerd2-proxy-api', branch = 'main' } diff --git a/go.mod b/go.mod index 882484b5eb3bd..d70ffd00f7a04 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,9 @@ module github.com/linkerd/linkerd2 go 1.22.0 +// Use the unreleased version of the proxy API to validate changes end-to-end. +replace github.com/linkerd/linkerd2-proxy-api => github.com/linkerd/linkerd2-proxy-api v0.14.1-0.20241106205231-6c316cc41a3a + require ( contrib.go.opencensus.io/exporter/ocagent v0.7.0 github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 diff --git a/go.sum b/go.sum index 4d7d4a2553259..e3c1e64c7d4a6 100644 --- 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.20241106205231-6c316cc41a3a h1:oVj8r0T7eUFLnwTvKmikeqedeJ8fnLE9keOdtpES8tE= +github.com/linkerd/linkerd2-proxy-api v0.14.1-0.20241106205231-6c316cc41a3a/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= diff --git a/policy-controller/grpc/src/inbound.rs b/policy-controller/grpc/src/inbound.rs index 1111bd11bf098..5892f74f05aca 100644 --- a/policy-controller/grpc/src/inbound.rs +++ b/policy-controller/grpc/src/inbound.rs @@ -147,16 +147,19 @@ fn to_server(srv: &InboundServer, cluster_networks: &[IpNet]) -> proto::Server { proto::proxy_protocol::Detect { timeout: timeout.try_into().map_err(|error| tracing::warn!(%error, "failed to convert protocol detect timeout to protobuf")).ok(), http_routes: http::to_route_list(&srv.http_routes, cluster_networks), + http_local_rate_limit: None, }, )), ProxyProtocol::Http1 => Some(proto::proxy_protocol::Kind::Http1( proto::proxy_protocol::Http1 { routes: http::to_route_list(&srv.http_routes, cluster_networks), + local_rate_limit: None, }, )), ProxyProtocol::Http2 => Some(proto::proxy_protocol::Kind::Http2( proto::proxy_protocol::Http2 { routes: http::to_route_list(&srv.http_routes, cluster_networks), + local_rate_limit: None, }, )), ProxyProtocol::Grpc => Some(proto::proxy_protocol::Kind::Grpc( diff --git a/policy-test/src/grpc.rs b/policy-test/src/grpc.rs index a25a1800e02f2..225a8c69e7615 100644 --- a/policy-test/src/grpc.rs +++ b/policy-test/src/grpc.rs @@ -52,6 +52,7 @@ macro_rules! assert_protocol_detect { $crate::grpc::defaults::http_route(), $crate::grpc::defaults::probe_route(), ], + http_local_rate_limit: None, } )), }), @@ -71,6 +72,7 @@ macro_rules! assert_protocol_detect_external { inbound::proxy_protocol::Detect { timeout: Some(std::time::Duration::from_secs(10).try_into().unwrap()), http_routes: vec![$crate::grpc::defaults::http_route()], + http_local_rate_limit: None, } )) }) @@ -381,6 +383,7 @@ pub mod defaults { inbound::ProxyProtocol { kind: Some(Kind::Http1(Http1 { routes: vec![http_route(), probe_route()], + local_rate_limit: None, })), } } @@ -390,6 +393,7 @@ pub mod defaults { inbound::ProxyProtocol { kind: Some(Kind::Http1(Http1 { routes: vec![http_route()], + local_rate_limit: None, })), } }