diff --git a/.changelog/11277.txt b/.changelog/11277.txt
new file mode 100644
index 000000000..9fdbabdd6
--- /dev/null
+++ b/.changelog/11277.txt
@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: update supported envoy versions to 1.20.0, 1.19.1, 1.18.4, 1.17.4
+```
diff --git a/.circleci/config.yml b/.circleci/config.yml
index 324b39455..78cdd2922 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -853,6 +853,11 @@ jobs:
environment:
ENVOY_VERSION: "1.19.1"
+ envoy-integration-test-1_20_0:
+ <<: *ENVOY_TESTS
+ environment:
+ ENVOY_VERSION: "1.20.0"
+
# run integration tests for the connect ca providers
test-connect-ca-providers:
docker:
@@ -1108,6 +1113,9 @@ workflows:
- envoy-integration-test-1_19_1:
requires:
- dev-build
+ - envoy-integration-test-1_20_0:
+ requires:
+ - dev-build
website:
unless: << pipeline.parameters.trigger-load-test >>
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index 1efd10da3..64f28d703 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -121,6 +121,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
"1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4",
"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4",
"1.19.0", "1.19.1",
+ "1.20.0",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index 530ff5d01..30c983d83 100644
--- a/agent/xds/proxysupport/proxysupport.go
+++ b/agent/xds/proxysupport/proxysupport.go
@@ -7,6 +7,7 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
+ "1.20.0",
"1.19.1",
"1.18.4",
"1.17.4",
diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-limits.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-19-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-19-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/defaults.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/defaults.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-19-x.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-19-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-19-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-19-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-19-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/clusters/transparent-proxy.envoy-1-19-x.golden b/agent/xds/testdata/clusters/transparent-proxy.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/transparent-proxy.envoy-1-19-x.golden
rename to agent/xds/testdata/clusters/transparent-proxy.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/defaults.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/defaults.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-19-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-19-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-19-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-19-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/defaults.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/defaults.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/expose-checks.envoy-1-19-x.golden b/agent/xds/testdata/listeners/expose-checks.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/expose-checks.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/expose-checks.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-19-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-19-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-19-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-19-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-19-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/http-upstream.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/http-upstream.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-19-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-19-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-19-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-19-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-19-x.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-19-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-19-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-19-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-19-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-19-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-19-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-19-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-19-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden b/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/listeners/transparent-proxy.envoy-1-19-x.golden b/agent/xds/testdata/listeners/transparent-proxy.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/transparent-proxy.envoy-1-19-x.golden
rename to agent/xds/testdata/listeners/transparent-proxy.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-19-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-19-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-19-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-19-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-20-x.golden
diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-19-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-20-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-19-x.golden
rename to agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-20-x.golden
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 736b3d9ff..8e64d2256 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-}
export TEST_V2_XDS
# ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.19.1"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.20.0"}
export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then
diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx
index 56e3a6732..c5e29b24c 100644
--- a/website/content/docs/connect/proxies/envoy.mdx
+++ b/website/content/docs/connect/proxies/envoy.mdx
@@ -35,7 +35,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
-| 1.11.x | 1.19.1, 1.18.4, 1.17.4, 1.16.5 |
+| 1.11.x | 1.20.0, 1.19.1, 1.18.4, 1.17.4 |
| 1.10.x | 1.18.4, 1.17.4, 1.16.5, 1.15.5 |
| 1.9.x | 1.16.5, 1.15.5, 1.14.71, 1.13.71 |
| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |