From 5e7e7e64778fafd40bc81d765175b688cf999a53 Mon Sep 17 00:00:00 2001 From: Oliver Gould Date: Wed, 14 Oct 2020 08:11:17 -0700 Subject: [PATCH] proxy: v2.115.0 (#5076) This release fixes several recent regressions: 1. The proxy could incorrectly emit inbound requests with absolute-form URIs. 2. Inbound tap metadata did not include source addresses or identities. 3. Gateway requests included the incorrect port in the `l5d-dst-canonical` header. 4. Gateway requests never included a `Host` header. Furthermore, support for the `LINKERD2_PROXY_OUTBOUND_PORTS_DISABLE_PROTOCOL_DETECTION` environment variable has been removed in anticipation of control plane changes that will provide this configuration via service profiles. This configuration is never set by the proxy injector, so this change does not pose any issues with regard to compatibility. --- * metrics: Coerce targets to metric labels by-reference (linkerd/linkerd2-proxy#706) * outbound: Unify TCP & HTTP target types (linkerd/linkerd2-proxy#707) * inbound: Fix source tap annotations (linkerd/linkerd2-proxy#712) * trace-context: Simplify implementation with async (linkerd/linkerd2-proxy#710) * outbound: Use profile to inform protocol detection (linkerd/linkerd2-proxy#708) * inbound: Fix URI normalization for orig-proto requests (linkerd/linkerd2-proxy#713) * outbound: more TCP tests, test cleanup (linkerd/linkerd2-proxy#711) * gateway: Ensure proper outbound metadata (linkerd/linkerd2-proxy#715) --- .proxy-version | 2 +- test/integration/multicluster/target2/target_test.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.proxy-version b/.proxy-version index 114c8c554..542b527ee 100644 --- a/.proxy-version +++ b/.proxy-version @@ -1 +1 @@ -v2.114.0 +v2.115.0 diff --git a/test/integration/multicluster/target2/target_test.go b/test/integration/multicluster/target2/target_test.go index 1c794c44d..23378c118 100644 --- a/test/integration/multicluster/target2/target_test.go +++ b/test/integration/multicluster/target2/target_test.go @@ -1,7 +1,6 @@ package target2 import ( - "errors" "fmt" "os" "strings" @@ -34,12 +33,13 @@ func TestTargetTraffic(t *testing.T) { if err != nil { return fmt.Errorf("%s\n%s", err, out) } + // Check for expected error messages for _, row := range strings.Split(out, "\n") { - if strings.Contains(row, "http://web-svc.emojivoto.svc.cluster.local:80/api/vote") { + if strings.Contains(row, " /api/vote?choice=:doughnut: ") { return nil } } - return errors.New("web-svc logs in target cluster were empty") + return fmt.Errorf("web-svc logs in target cluster do not include voting errors\n%s", out) }) if err != nil { testutil.AnnotatedFatal(t, fmt.Sprintf("'linkerd multicluster gateways' command timed-out (%s)", timeout), err)