Skip to content

Commit 16d648d

Browse files
authored
proxy: v2.190.1 (#10342)
This release includes many internal changes to prepare for the new client policy API. Stack metric label values have changed to reflect the new shape of the outbound proxy. This change also includes some test improvements that helped debug an issue while merging this. --- * build(deps): bump try-lock from 0.2.3 to 0.2.4 (linkerd/linkerd2-proxy#2139) * build(deps): bump regex from 1.7.0 to 1.7.1 (linkerd/linkerd2-proxy#2145) * build(deps): bump tokio from 1.24.0 to 1.24.1 (linkerd/linkerd2-proxy#2144) * Parameterize the load balancer stack (linkerd/linkerd2-proxy#2142) * build(deps): bump prost-types from 0.11.5 to 0.11.6 (linkerd/linkerd2-proxy#2147) * build(deps): bump prost from 0.11.5 to 0.11.6 (linkerd/linkerd2-proxy#2148) * build(deps): bump prost-build from 0.11.5 to 0.11.6 (linkerd/linkerd2-proxy#2149) * stack: add `AnnotateError` middleware (linkerd/linkerd2-proxy#2158) * Fix proxy-core dependencies (linkerd/linkerd2-proxy#2163) * build(deps): bump tj-actions/changed-files from 35.3.1 to 35.4.1 (linkerd/linkerd2-proxy#2153) * orig_proto: don't set `connection: close` on errors (linkerd/linkerd2-proxy#2171) * build(deps): bump bumpalo from 3.11.1 to 3.12.0 (linkerd/linkerd2-proxy#2166) * build(deps): bump proc-macro2 from 1.0.49 to 1.0.50 (linkerd/linkerd2-proxy#2165) * build(deps): bump tj-actions/changed-files from 35.4.1 to 35.4.4 (linkerd/linkerd2-proxy#2172) * build(deps): bump windows_x86_64_msvc from 0.42.0 to 0.42.1 (linkerd/linkerd2-proxy#2164) * configure buffers from target `Param`s (linkerd/linkerd2-proxy#2173) * Simplify profile discovery (linkerd/linkerd2-proxy#2170) * stack: Unify AnnotateError and MapErr (linkerd/linkerd2-proxy#2180) * build(deps): bump windows_aarch64_msvc from 0.42.0 to 0.42.1 (linkerd/linkerd2-proxy#2176) * build(deps): bump async-trait from 0.1.61 to 0.1.63 (linkerd/linkerd2-proxy#2177) * build(deps): bump tokio from 1.24.1 to 1.24.2 (linkerd/linkerd2-proxy#2178) * Add the `meshtls-boring-fips` feature flag (linkerd/linkerd2-proxy#2168) * Update HTTP error responder to log version info (linkerd/linkerd2-proxy#2182) * build(deps): bump which from 4.3.0 to 4.4.0 (linkerd/linkerd2-proxy#2185) * build(deps): bump derive_arbitrary from 1.2.2 to 1.2.3 (linkerd/linkerd2-proxy#2184) * build(deps): bump unicode-bidi from 0.3.8 to 0.3.10 (linkerd/linkerd2-proxy#2183) * build(deps): bump linkerd/dev from 38 to 39 (linkerd/linkerd2-proxy#2175) * add target metadata to error contexts (linkerd/linkerd2-proxy#2162) * build(deps): bump rustls from 0.20.7 to 0.20.8 (linkerd/linkerd2-proxy#2187) * build(deps): bump ahash from 0.8.2 to 0.8.3 (linkerd/linkerd2-proxy#2188) * build(deps): bump matches from 0.1.9 to 0.1.10 (linkerd/linkerd2-proxy#2189) * Rename MakeThunk to NewThunk (linkerd/linkerd2-proxy#2197) * Add `NewQueueWithoutTimeout` (linkerd/linkerd2-proxy#2196) * Cache discovery results independently of proxy stacks (linkerd/linkerd2-proxy#2195) * core: Rename Stack utilities for clarity (linkerd/linkerd2-proxy#2199) * gateway: Unify discovery for HTTP & opaque stacks (linkerd/linkerd2-proxy#2198) * build(deps): bump libfuzzer-sys from 0.4.5 to 0.4.6 (linkerd/linkerd2-proxy#2193) * build(deps): bump arbitrary from 1.2.2 to 1.2.3 (linkerd/linkerd2-proxy#2191) * http: Remove `Clone` requirement in servers (linkerd/linkerd2-proxy#2200) * build(deps): bump either from 1.8.0 to 1.8.1 (linkerd/linkerd2-proxy#2192) * build(deps): bump bytes from 1.3.0 to 1.4.0 (linkerd/linkerd2-proxy#2202) * build(deps): bump cc from 1.0.78 to 1.0.79 (linkerd/linkerd2-proxy#2203) * build(deps): bump tj-actions/changed-files from 35.4.4 to 35.5.1 (linkerd/linkerd2-proxy#2211) * build(deps): bump tokio from 1.24.2 to 1.25.0 (linkerd/linkerd2-proxy#2206) * build(deps): bump miniz_oxide from 0.6.2 to 0.6.4 (linkerd/linkerd2-proxy#2207) * build(deps): bump async-trait from 0.1.63 to 0.1.64 (linkerd/linkerd2-proxy#2205) * Split outbound test modules into files (linkerd/linkerd2-proxy#2213) * Disable broken tests (linkerd/linkerd2-proxy#2214) * Add traceparent header parsing for w3c tracecontext (linkerd/linkerd2-proxy#2179) * Simplify the `Resolve` trait alias (linkerd/linkerd2-proxy#2218) * downgrade `miniz_oxide` from yanked 0.6.4 to 0.6.2 (linkerd/linkerd2-proxy#2219) * build(deps): bump heck from 0.4.0 to 0.4.1 (linkerd/linkerd2-proxy#2215) * ci: Fix check-each workflow (linkerd/linkerd2-proxy#2222) * Use a cascading stack with protocol detection (linkerd/linkerd2-proxy#2221) * ci: Fix quotation in list-crates (linkerd/linkerd2-proxy#2225) * outbound: Split out separate 'opaq' modules (linkerd/linkerd2-proxy#2224) * Update `linkerd2-proxy-api` to v0.8.0 (linkerd/linkerd2-proxy#2223) * outbound: Lint stack target types (linkerd/linkerd2-proxy#2226) * outbound: Split sidecar and ingress stack modules (linkerd/linkerd2-proxy#2227) * gateway: Split 'http' and 'opaq' modules (linkerd/linkerd2-proxy#2230) * test: Disable tap::rejects_incorrect_identity_when_identity_is_expected (linkerd/linkerd2-proxy#2231) * outbound: Improve discovery cache test (linkerd/linkerd2-proxy#2233) * integration: add destination update builders (linkerd/linkerd2-proxy#2232) * Rename linkerd-server-policy to linkerd-proxy-server-policy (linkerd/linkerd2-proxy#2235) * integration: add test for direct HTTP connections (linkerd/linkerd2-proxy#2234) * outbound: Refactor stack target types (linkerd/linkerd2-proxy#2210) * Add client-policy types (linkerd/linkerd2-proxy#2236)
1 parent e9eac4c commit 16d648d

File tree

3 files changed

+30
-7
lines changed

3 files changed

+30
-7
lines changed

.proxy-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v2.189.0
1+
v2.190.1

test/integration/deep/norelay/norelay_test.go

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package norelay
22

33
import (
44
"context"
5+
"fmt"
56
"os"
67
"strings"
78
"testing"
@@ -71,6 +72,10 @@ func TestNoRelay(t *testing.T) {
7172
// forcing an open relay by changing the value of
7273
// LINKERD2_PROXY_OUTBOUND_LISTEN_ADDR from 127.0.0.1:4140 to 0.0.0.0:4140,
7374
// which is not possible without manually changing the injected proxy yaml
75+
//
76+
// We don't care if this behavior breaks--it's not a supported configuration.
77+
// However, this test is oddly useful in finding bugs in ingress-mode proxy
78+
// configurations, so we keep it around. ¯\_(ツ)_/¯
7479
func TestRelay(t *testing.T) {
7580
ctx := context.Background()
7681
deployments := getDeployments(t)
@@ -109,11 +114,20 @@ func TestRelay(t *testing.T) {
109114
relayIP := strings.Trim(ip, "'")
110115
o, err := TestHelper.Kubectl(
111116
"", "-n", ns, "exec", "deploy/client",
112-
"--", "curl", "-f", "-H", "l5d-dst-override: server-hello."+ns+".svc.cluster.local:8080", "http://"+relayIP+":4140",
117+
"--", "curl", "-fsv", "-H", "l5d-dst-override: server-hello."+ns+".svc.cluster.local:8080", "http://"+relayIP+":4140",
113118
)
114119
if err != nil {
120+
log, err := TestHelper.Kubectl(
121+
"", "logs",
122+
"-n", ns,
123+
"-l", "app=server-relay",
124+
"-c", "linkerd-proxy",
125+
)
126+
if err != nil {
127+
log = fmt.Sprintf("failed to retrieve server-relay logs: %s", err)
128+
}
115129
testutil.AnnotatedFatalf(t, "unexpected error returned",
116-
"unexpected error returned: %s\n%s", o, err)
130+
"unexpected error returned: %s\n%s\n---\n%s", o, err, log)
117131
}
118132
if !strings.Contains(o, "HELLO-FROM-SERVER") {
119133
testutil.AnnotatedFatalf(t, "unexpected response returned",
@@ -133,7 +147,7 @@ func getDeployments(t *testing.T) map[string]string {
133147
}
134148

135149
// server-relay is injected in ingress mode, manually
136-
deploys["server-relay"], err = TestHelper.LinkerdRun("inject", "--manual", "--ingress", "testdata/server-relay.yml")
150+
deploys["server-relay"], err = TestHelper.LinkerdRun("inject", "--manual", "--ingress", "--proxy-log-level=linkerd=debug,info", "testdata/server-relay.yml")
137151
if err != nil {
138152
testutil.AnnotatedFatal(t, "unexpected error", err)
139153
}

test/integration/multicluster/multicluster-traffic/mc_traffic_test.go

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,10 @@ func TestGateways(t *testing.T) {
126126
func TestCheckGatewayAfterRepairEndpoints(t *testing.T) {
127127
// Re-build the clientset with the source context
128128
if err := TestHelper.SwitchContext(contexts[testutil.SourceContextKey]); err != nil {
129-
testutil.AnnotatedFatalf(t, "failed to rebuild helper clientset with new context", "failed to rebuild helper clientset with new context [%s]: %v", contexts[testutil.SourceContextKey], err)
129+
testutil.AnnotatedFatalf(t,
130+
"failed to rebuild helper clientset with new context",
131+
"failed to rebuild helper clientset with new context [%s]: %v",
132+
contexts[testutil.SourceContextKey], err)
130133
}
131134
time.Sleep(time.Minute + 5*time.Second)
132135
if err := TestHelper.TestCheck("--context", contexts[testutil.SourceContextKey]); err != nil {
@@ -143,12 +146,18 @@ func TestCheckGatewayAfterRepairEndpoints(t *testing.T) {
143146
// connections from the gateway pod to the web-svc?
144147
func TestTargetTraffic(t *testing.T) {
145148
if err := TestHelper.SwitchContext(contexts[testutil.TargetContextKey]); err != nil {
146-
testutil.AnnotatedFatalf(t, "failed to rebuild helper clientset with new context", "failed to rebuild helper clientset with new context [%s]: %v", contexts[testutil.TargetContextKey], err)
149+
testutil.AnnotatedFatalf(t,
150+
"failed to rebuild helper clientset with new context",
151+
"failed to rebuild helper clientset with new context [%s]: %v",
152+
contexts[testutil.TargetContextKey], err)
147153
}
148154

149155
ctx := context.Background()
150156
// Create emojivoto in target cluster, to be deleted at the end of the test.
151-
TestHelper.WithDataPlaneNamespace(ctx, "emojivoto", map[string]string{}, t, func(t *testing.T, ns string) {
157+
annotations := map[string]string{
158+
// "config.linkerd.io/proxy-log-level": "linkerd=debug,info",
159+
}
160+
TestHelper.WithDataPlaneNamespace(ctx, "emojivoto", annotations, t, func(t *testing.T, ns string) {
152161
t.Run("Deploy resources in source and target clusters", func(t *testing.T) {
153162
// Deploy vote-bot client in source-cluster
154163
o, err := TestHelper.KubectlApplyWithContext("", contexts[testutil.SourceContextKey], "-f", "testdata/vote-bot.yml")

0 commit comments

Comments
 (0)