diff --git a/.changelog/11115.txt b/.changelog/11115.txt new file mode 100644 index 0000000000..13ff40a439 --- /dev/null +++ b/.changelog/11115.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.19.1, 1.18.4, 1.17.4, 1.16.5 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 54798f322a..5f35f8ba4b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -859,6 +859,11 @@ jobs: environment: ENVOY_VERSION: "1.18.4" + envoy-integration-test-1_19_1: + <<: *ENVOY_TESTS + environment: + ENVOY_VERSION: "1.19.1" + # run integration tests for the connect ca providers test-connect-ca-providers: docker: @@ -1117,6 +1122,9 @@ workflows: - envoy-integration-test-1_18_4: requires: - dev-build + - envoy-integration-test-1_19_1: + 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 007f328fe9..bbcd9c7c52 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.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5", "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", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index a8f0b5051b..908a7ba401 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.19.1", "1.18.4", "1.17.4", "1.16.5", diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-limits.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-18-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-18-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/defaults.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-18-x.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-18-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-18-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-18-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-18-x.golden b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy.envoy-1-18-x.golden b/agent/xds/testdata/clusters/transparent-proxy.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy.envoy-1-18-x.golden rename to agent/xds/testdata/clusters/transparent-proxy.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/defaults.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-18-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-18-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-18-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/defaults.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/expose-checks.envoy-1-18-x.golden b/agent/xds/testdata/listeners/expose-checks.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-checks.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/expose-checks.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-18-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-18-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-18-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-18-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-18-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/http-upstream.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.envoy-1-18-x.golden deleted file mode 100644 index 70b6200188..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.envoy-1-18-x.golden +++ /dev/null @@ -1,142 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "http:1.2.3.4:8080", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 8080 - } - }, - "filterChains": [ - { - "filterChainMatch": { - "serverNames": [ - "s1.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s1", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V3" - }, - "routeConfigName": "8080_s1" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s1.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster-1" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - }, - { - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V3" - }, - "routeConfigName": "8080" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "*.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster-2" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "listenerFilters": [ - { - "name": "envoy.filters.listener.tls_inspector" - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.v2compat.envoy-1-16-x.golden deleted file mode 100644 index 3eb45c4f31..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener+service-level.v2compat.envoy-1-16-x.golden +++ /dev/null @@ -1,144 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.api.v2.Listener", - "name": "http:1.2.3.4:8080", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 8080 - } - }, - "filterChains": [ - { - "filterChainMatch": { - "serverNames": [ - "s1.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s1", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V2" - }, - "routeConfigName": "8080_s1" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s1.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V2", - "clusterNames": [ - "sds-cluster-1" - ] - }, - "resourceApiVersion": "V2" - } - } - ] - }, - "requireClientCertificate": false - } - } - }, - { - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V2" - }, - "routeConfigName": "8080" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "*.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V2", - "clusterNames": [ - "sds-cluster-2" - ] - }, - "resourceApiVersion": "V2" - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "listenerFilters": [ - { - "name": "envoy.filters.listener.tls_inspector" - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.envoy-1-18-x.golden deleted file mode 100644 index c887414511..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.envoy-1-18-x.golden +++ /dev/null @@ -1,147 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "http:1.2.3.4:8080", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 8080 - } - }, - "filterChains": [ - { - "filterChainMatch": { - "serverNames": [ - "s1.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s1", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V3" - }, - "routeConfigName": "8080_s1" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s1.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster-1" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - }, - { - "filterChainMatch": { - "serverNames": [ - "s2.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s2", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V3" - }, - "routeConfigName": "8080_s2" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s2.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster-2" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "listenerFilters": [ - { - "name": "envoy.filters.listener.tls_inspector" - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.v2compat.envoy-1-16-x.golden deleted file mode 100644 index 4c53a0af2b..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener-service-level.v2compat.envoy-1-16-x.golden +++ /dev/null @@ -1,149 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.api.v2.Listener", - "name": "http:1.2.3.4:8080", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 8080 - } - }, - "filterChains": [ - { - "filterChainMatch": { - "serverNames": [ - "s1.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s1", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V2" - }, - "routeConfigName": "8080_s1" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s1.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V2", - "clusterNames": [ - "sds-cluster-1" - ] - }, - "resourceApiVersion": "V2" - } - } - ] - }, - "requireClientCertificate": false - } - } - }, - { - "filterChainMatch": { - "serverNames": [ - "s2.example.com" - ] - }, - "filters": [ - { - "name": "envoy.filters.network.http_connection_manager", - "typedConfig": { - "@type": "type.googleapis.com/envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager", - "statPrefix": "ingress_upstream_8080_s2", - "rds": { - "configSource": { - "ads": { - - }, - "resourceApiVersion": "V2" - }, - "routeConfigName": "8080_s2" - }, - "httpFilters": [ - { - "name": "envoy.filters.http.router" - } - ], - "tracing": { - "randomSampling": { - - } - } - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "s2.example.com-cert", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V2", - "clusterNames": [ - "sds-cluster-2" - ] - }, - "resourceApiVersion": "V2" - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "listenerFilters": [ - { - "name": "envoy.filters.listener.tls_inspector" - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener.envoy-1-18-x.golden deleted file mode 100644 index aff11429cb..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener.envoy-1-18-x.golden +++ /dev/null @@ -1,58 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.config.listener.v3.Listener", - "name": "db:1.2.3.4:9191", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 9191 - } - }, - "filterChains": [ - { - "filters": [ - { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.filters.network.tcp_proxy.v3.TcpProxy", - "statPrefix": "upstream.db.default.dc1", - "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.extensions.transport_sockets.tls.v3.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "cert-resource", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.config.listener.v3.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener.v2compat.envoy-1-16-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener.v2compat.envoy-1-16-x.golden deleted file mode 100644 index 0013a1a29e..0000000000 --- a/agent/xds/testdata/listeners/ingress-with-sds-listener.v2compat.envoy-1-16-x.golden +++ /dev/null @@ -1,58 +0,0 @@ -{ - "versionInfo": "00000001", - "resources": [ - { - "@type": "type.googleapis.com/envoy.api.v2.Listener", - "name": "db:1.2.3.4:9191", - "address": { - "socketAddress": { - "address": "1.2.3.4", - "portValue": 9191 - } - }, - "filterChains": [ - { - "filters": [ - { - "name": "envoy.filters.network.tcp_proxy", - "typedConfig": { - "@type": "type.googleapis.com/envoy.config.filter.network.tcp_proxy.v2.TcpProxy", - "statPrefix": "upstream.db.default.dc1", - "cluster": "db.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul" - } - } - ], - "transportSocket": { - "name": "tls", - "typedConfig": { - "@type": "type.googleapis.com/envoy.api.v2.auth.DownstreamTlsContext", - "commonTlsContext": { - "tlsParams": { - - }, - "tlsCertificateSdsSecretConfigs": [ - { - "name": "cert-resource", - "sdsConfig": { - "apiConfigSource": { - "apiType": "GRPC", - "transportApiVersion": "V3", - "clusterNames": [ - "sds-cluster" - ] - } - } - } - ] - }, - "requireClientCertificate": false - } - } - } - ], - "trafficDirection": "OUTBOUND" - } - ], - "typeUrl": "type.googleapis.com/envoy.api.v2.Listener", - "nonce": "00000001" -} \ No newline at end of file diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-18-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-18-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-18-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-18-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-18-x.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-18-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-18-x.golden b/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-19-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy.envoy-1-18-x.golden b/agent/xds/testdata/listeners/transparent-proxy.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy.envoy-1-18-x.golden rename to agent/xds/testdata/listeners/transparent-proxy.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-18-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-18-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-18-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-18-x.golden rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-18-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-18-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-18-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-18-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-19-x.golden diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-18-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-19-x.golden similarity index 100% rename from agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-18-x.golden rename to agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-19-x.golden diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden index dae16ddb7b..0f31072358 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index cca9e2fb5f..238867b5be 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index b37b9ef7a9..dce784f8c9 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden index 7e50ee3082..4504f5f883 100644 --- a/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden +++ b/command/connect/envoy/testdata/deprecated-grpc-addr-config.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index e04c3caf02..d5a799da50 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 9125a4f83d..1c2d858d10 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 920d3a7254..7c6ba252b6 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 695ac7763b..3e0758d7f3 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 7e50ee3082..4504f5f883 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 7e50ee3082..4504f5f883 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 22d410a76b..cfdde83303 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index 5ffc76b351..67325ff147 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden index df818334db..4c7cfd7053 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden index 0c6c652778..c279d0c9ab 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden index 95f1f2d1d7..2db10e81a4 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 98e6230bb8..d210599747 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index 990a116ae1..dc8eb4ed2b 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index a8b3a1257a..a491dda8f4 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 5f6d1d6e73..8043094320 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 5f6d1d6e73..8043094320 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 5f6d1d6e73..8043094320 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 5f6d1d6e73..8043094320 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/xds-addr-config.golden b/command/connect/envoy/testdata/xds-addr-config.golden index 7e50ee3082..4504f5f883 100644 --- a/command/connect/envoy/testdata/xds-addr-config.golden +++ b/command/connect/envoy/testdata/xds-addr-config.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index a58b7c3a43..25398b4be4 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -14,7 +14,7 @@ "metadata": { "namespace": "default", "partition": "default", - "envoy_version": "1.18.4" + "envoy_version": "1.19.1" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 890a567155..2197d41029 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.18.4"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.19.1"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx index 285e95304b..b6a5ee8e7b 100644 --- a/website/content/commands/connect/envoy.mdx +++ b/website/content/commands/connect/envoy.mdx @@ -75,7 +75,7 @@ proxy configuration needed. allowed to access by [Connect intentions](/docs/connect/intentions). - `-envoy-version` - The version of envoy that is being started. Default is - `1.18.4`. This is required so that the correct configuration can be generated. + `1.19.1`. This is required so that the correct configuration can be generated. - `-no-central-config` - By default the proxy's bootstrap configuration can be customized centrally. This requires that the command run on the same agent diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 13e6759e89..56e3a6732c 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -35,6 +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.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 |