From 47ff5327350f3fef391e02c62f0e8757fd8fbec9 Mon Sep 17 00:00:00 2001 From: Chris Piraino Date: Tue, 18 Feb 2020 09:25:47 -0600 Subject: [PATCH] Fixes envoy config when both RetryOn* values are set (#7280) --- agent/xds/routes.go | 2 +- .../testdata/routes/connect-proxy-with-chain-and-router.golden | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/xds/routes.go b/agent/xds/routes.go index 520545bdc3..5384a6f301 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -129,7 +129,7 @@ func makeUpstreamRouteForDiscoveryChain( } if len(destination.RetryOnStatusCodes) > 0 { if retryPolicy.RetryOn != "" { - retryPolicy.RetryOn = ",retriable-status-codes" + retryPolicy.RetryOn = retryPolicy.RetryOn + ",retriable-status-codes" } else { retryPolicy.RetryOn = "retriable-status-codes" } diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.golden index 8380ea490e..abd0c8330f 100644 --- a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.golden +++ b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.golden @@ -281,7 +281,7 @@ "route": { "cluster": "retry-both.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul", "retryPolicy": { - "retryOn": ",retriable-status-codes", + "retryOn": "connect-failure,retriable-status-codes", "retriableStatusCodes": [ 401, 409,