Fixes envoy config when both RetryOn* values are set (#7280)

hashicorp · Feb 18, 2020 · 47ff532 · 47ff532
1 parent b83c190
commit 47ff532
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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,