From abc1dc0fe958e2ab82cb90aab97cbe46be0bc101 Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" <4903+rboyer@users.noreply.github.com> Date: Thu, 29 Apr 2021 15:22:03 -0500 Subject: [PATCH] connect: update supported envoy versions to 1.18.2, 1.17.2, 1.16.3, and 1.15.4 (#10101) The only thing that needed fixing up pertained to this section of the 1.18.x release notes: > grpc_stats: the default value for stats_for_all_methods is switched from true to false, in order to avoid possible memory exhaustion due to an untrusted downstream sending a large number of unique method names. The previous default value was deprecated in version 1.14.0. This only changes the behavior when the value is not set. The previous behavior can be used by setting the value to true. This behavior change by be overridden by setting runtime feature envoy.deprecated_features.grpc_stats_filter_enable_stats_for_all_methods_by_default. For now to maintain status-quo I'm explicitly setting `stats_for_all_methods=true` in all versions to avoid relying upon the default. Additionally the naming of the emitted metrics for these gRPC requests changed slightly so the integration test assertions for `case-grpc` needed adjusting. --- .changelog/10101.txt | 3 ++ .circleci/config.yml | 45 +++++++---------- agent/xds/clusters_test.go | 7 ++- agent/xds/endpoints_test.go | 7 ++- agent/xds/envoy_versioning.go | 2 +- agent/xds/envoy_versioning_test.go | 16 +++++-- agent/xds/listeners.go | 21 +++++++- agent/xds/listeners_test.go | 7 ++- agent/xds/proxysupport/proxysupport.go | 13 +++-- agent/xds/routes_test.go | 7 ++- ...-proxy-lb-in-resolver.envoy-1-18-x.golden} | 0 ...-in-resolver.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-failover.envoy-1-18-x.golden} | 0 ...and-failover.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...nect-proxy-with-chain.envoy-1-18-x.golden} | 0 ...y-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...-max-connections-only.envoy-1-18-x.golden} | 0 ...ections-only.v2compat.envoy-1-16-x.golden} | 0 ...om-limits-set-to-zero.envoy-1-18-x.golden} | 0 ...-set-to-zero.v2compat.envoy-1-16-x.golden} | 0 ...lden => custom-limits.envoy-1-18-x.golden} | 0 ...ustom-limits.v2compat.envoy-1-16-x.golden} | 0 ...n => custom-local-app.envoy-1-18-x.golden} | 0 ...om-local-app.v2compat.envoy-1-16-x.golden} | 0 ...en => custom-timeouts.envoy-1-18-x.golden} | 0 ...tom-timeouts.v2compat.envoy-1-16-x.golden} | 0 ...pstream-default-chain.envoy-1-18-x.golden} | 0 ...efault-chain.v2compat.envoy-1-16-x.golden} | 0 ...en => custom-upstream.envoy-1-18-x.golden} | 0 ...tom-upstream.v2compat.envoy-1-16-x.golden} | 0 ...-x.golden => defaults.envoy-1-18-x.golden} | 0 ... => defaults.v2compat.envoy-1-16-x.golden} | 0 ...rpc-new-cluster-http1.envoy-1-18-x.golden} | 0 ...luster-http1.v2compat.envoy-1-16-x.golden} | 0 ...paths-local-app-paths.envoy-1-18-x.golden} | 0 ...al-app-paths.v2compat.envoy-1-16-x.golden} | 0 ...ths-new-cluster-http2.envoy-1-18-x.golden} | 0 ...luster-http2.v2compat.envoy-1-16-x.golden} | 0 ...s-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...en => ingress-gateway.envoy-1-18-x.golden} | 0 ...ress-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ngress-lb-in-resolver.envoy-1-18-x.golden} | 0 ...-in-resolver.v2compat.envoy-1-16-x.golden} | 0 ...ers-duplicate-service.envoy-1-18-x.golden} | 0 ...cate-service.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-failover.envoy-1-18-x.golden} | 0 ...and-failover.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...=> ingress-with-chain.envoy-1-18-x.golden} | 0 ...s-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...teway-hash-lb-ignored.envoy-1-18-x.golden} | 0 ...h-lb-ignored.v2compat.envoy-1-16-x.golden} | 0 ...gnore-extra-resolvers.envoy-1-18-x.golden} | 0 ...ra-resolvers.v2compat.envoy-1-16-x.golden} | 0 ...h-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...-non-hash-lb-injected.envoy-1-18-x.golden} | 0 ...-lb-injected.v2compat.envoy-1-16-x.golden} | 0 ...teway-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...eway-service-timeouts.envoy-1-18-x.golden} | 0 ...ice-timeouts.v2compat.envoy-1-16-x.golden} | 0 ...ing-federation-states.envoy-1-18-x.golden} | 0 ...ation-states.v2compat.envoy-1-16-x.golden} | 0 ...olden => mesh-gateway.envoy-1-18-x.golden} | 0 ...mesh-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...tname-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...gnore-extra-resolvers.envoy-1-18-x.golden} | 0 ...ra-resolvers.v2compat.envoy-1-16-x.golden} | 0 ...ing-gateway-lb-config.envoy-1-18-x.golden} | 0 ...ay-lb-config.v2compat.envoy-1-16-x.golden} | 0 ...g-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...teway-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...> terminating-gateway.envoy-1-18-x.golden} | 0 ...ting-gateway.v2compat.envoy-1-16-x.golden} | 0 ... => transparent-proxy.envoy-1-18-x.golden} | 0 ...parent-proxy.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-failover.envoy-1-18-x.golden} | 0 ...and-failover.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...nect-proxy-with-chain.envoy-1-18-x.golden} | 0 ...y-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...in-and-custom-cluster.envoy-1-18-x.golden} | 0 ...stom-cluster.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...-x.golden => defaults.envoy-1-18-x.golden} | 0 ... => defaults.v2compat.envoy-1-16-x.golden} | 0 ...s-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...en => ingress-gateway.envoy-1-18-x.golden} | 0 ...ress-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ers-duplicate-service.envoy-1-18-x.golden} | 0 ...cate-service.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-failover.envoy-1-18-x.golden} | 0 ...and-failover.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...=> ingress-with-chain.envoy-1-18-x.golden} | 0 ...s-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...cal-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ote-gateway-triggered.envoy-1-18-x.golden} | 0 ...ay-triggered.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...efault-service-subset.envoy-1-18-x.golden} | 0 ...rvice-subset.v2compat.envoy-1-16-x.golden} | 0 ...h-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...teway-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...ing-federation-states.envoy-1-18-x.golden} | 0 ...ation-states.v2compat.envoy-1-16-x.golden} | 0 ...olden => mesh-gateway.envoy-1-18-x.golden} | 0 ...mesh-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...efault-service-subset.envoy-1-18-x.golden} | 0 ...rvice-subset.v2compat.envoy-1-16-x.golden} | 0 ...g-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...teway-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...> terminating-gateway.envoy-1-18-x.golden} | 0 ...ting-gateway.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 7 +++ ...nd-overrides.v2compat.envoy-1-16-x.golden} | 7 +++ ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...proxy-with-grpc-chain.envoy-1-18-x.golden} | 7 +++ ...h-grpc-chain.v2compat.envoy-1-16-x.golden} | 7 +++ ...proxy-with-http-chain.envoy-1-18-x.golden} | 0 ...h-http-chain.v2compat.envoy-1-16-x.golden} | 0 ...roxy-with-http2-chain.envoy-1-18-x.golden} | 0 ...-http2-chain.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...-proxy-with-tcp-chain.envoy-1-18-x.golden} | 0 ...th-tcp-chain.v2compat.envoy-1-16-x.golden} | 0 ...ublic-listener-http-2.envoy-1-18-x.golden} | 0 ...tener-http-2.v2compat.envoy-1-16-x.golden} | 0 ...listener-http-missing.envoy-1-18-x.golden} | 0 ...http-missing.v2compat.envoy-1-16-x.golden} | 0 ...-public-listener-http.envoy-1-18-x.golden} | 0 ...istener-http.v2compat.envoy-1-16-x.golden} | 0 ...ustom-public-listener.envoy-1-18-x.golden} | 0 ...lic-listener.v2compat.envoy-1-16-x.golden} | 0 ...ored-with-disco-chain.envoy-1-18-x.golden} | 0 ...-disco-chain.v2compat.envoy-1-16-x.golden} | 0 ...en => custom-upstream.envoy-1-18-x.golden} | 0 ...tom-upstream.v2compat.envoy-1-16-x.golden} | 0 ...-x.golden => defaults.envoy-1-18-x.golden} | 0 ... => defaults.v2compat.envoy-1-16-x.golden} | 0 ...lden => expose-checks.envoy-1-18-x.golden} | 0 ...xpose-checks.v2compat.envoy-1-16-x.golden} | 0 ...paths-local-app-paths.envoy-1-18-x.golden} | 0 ...al-app-paths.v2compat.envoy-1-16-x.golden} | 0 ...ths-new-cluster-http2.envoy-1-18-x.golden} | 0 ...luster-http2.v2compat.envoy-1-16-x.golden} | 0 ...istener-with-timeouts.envoy-1-18-x.golden} | 0 ...ith-timeouts.v2compat.envoy-1-16-x.golden} | 0 ... http-public-listener.envoy-1-18-x.golden} | 0 ...lic-listener.v2compat.envoy-1-16-x.golden} | 0 ...lden => http-upstream.envoy-1-18-x.golden} | 0 ...ttp-upstream.v2compat.envoy-1-16-x.golden} | 0 ...ss-gateway-bind-addrs.envoy-1-18-x.golden} | 0 ...y-bind-addrs.v2compat.envoy-1-16-x.golden} | 0 ...s-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...en => ingress-gateway.envoy-1-18-x.golden} | 0 ...ress-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ttp-multiple-services.envoy-1-18-x.golden} | 0 ...ple-services.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 7 +++ ...nd-overrides.v2compat.envoy-1-16-x.golden} | 7 +++ ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...through-local-gateway.envoy-1-18-x.golden} | 0 ...ocal-gateway.v2compat.envoy-1-16-x.golden} | 0 ...hrough-remote-gateway.envoy-1-18-x.golden} | 0 ...mote-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ess-with-tls-listener.envoy-1-18-x.golden} | 0 ...tls-listener.v2compat.envoy-1-16-x.golden} | 0 ...ner-bind-address-port.envoy-1-18-x.golden} | 0 ...address-port.v2compat.envoy-1-16-x.golden} | 0 ...listener-bind-address.envoy-1-18-x.golden} | 0 ...bind-address.v2compat.envoy-1-16-x.golden} | 0 ...=> listener-bind-port.envoy-1-18-x.golden} | 0 ...er-bind-port.v2compat.envoy-1-16-x.golden} | 0 ...eway-custom-addresses.envoy-1-18-x.golden} | 0 ...om-addresses.v2compat.envoy-1-16-x.golden} | 0 ...h-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...eway-tagged-addresses.envoy-1-18-x.golden} | 0 ...ed-addresses.v2compat.envoy-1-16-x.golden} | 0 ...ing-federation-states.envoy-1-18-x.golden} | 0 ...ation-states.v2compat.envoy-1-16-x.golden} | 0 ...olden => mesh-gateway.envoy-1-18-x.golden} | 0 ...mesh-gateway.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...-and-tagged-addresses.envoy-1-18-x.golden} | 0 ...ed-addresses.v2compat.envoy-1-16-x.golden} | 0 ...g-gateway-no-api-cert.envoy-1-18-x.golden} | 0 ...-no-api-cert.v2compat.envoy-1-16-x.golden} | 0 ...g-gateway-no-services.envoy-1-18-x.golden} | 0 ...-no-services.v2compat.envoy-1-16-x.golden} | 0 ...teway-service-subsets.envoy-1-18-x.golden} | 0 ...vice-subsets.v2compat.envoy-1-16-x.golden} | 0 ...> terminating-gateway.envoy-1-18-x.golden} | 0 ...ting-gateway.v2compat.envoy-1-16-x.golden} | 0 ...log-destinations-only.envoy-1-18-x.golden} | 0 ...nations-only.v2compat.envoy-1-16-x.golden} | 0 ... => transparent-proxy.envoy-1-18-x.golden} | 0 ...parent-proxy.v2compat.envoy-1-16-x.golden} | 0 ...-proxy-lb-in-resolver.envoy-1-18-x.golden} | 0 ...-in-resolver.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...with-chain-and-router.envoy-1-18-x.golden} | 0 ...n-and-router.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-splitter.envoy-1-18-x.golden} | 0 ...and-splitter.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...nect-proxy-with-chain.envoy-1-18-x.golden} | 0 ...y-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...roxy-with-grpc-router.envoy-1-18-x.golden} | 0 ...-grpc-router.v2compat.envoy-1-16-x.golden} | 0 ... => defaults-no-chain.envoy-1-18-x.golden} | 0 ...lts-no-chain.v2compat.envoy-1-16-x.golden} | 0 ...ess-defaults-no-chain.envoy-1-18-x.golden} | 0 ...lts-no-chain.v2compat.envoy-1-16-x.golden} | 0 ...ttp-multiple-services.envoy-1-18-x.golden} | 0 ...ple-services.v2compat.envoy-1-16-x.golden} | 0 ...ngress-lb-in-resolver.envoy-1-18-x.golden} | 0 ...-in-resolver.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...h-chain-and-overrides.envoy-1-18-x.golden} | 0 ...nd-overrides.v2compat.envoy-1-16-x.golden} | 0 ...with-chain-and-router.envoy-1-18-x.golden} | 0 ...n-and-router.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-and-splitter.envoy-1-18-x.golden} | 0 ...and-splitter.v2compat.envoy-1-16-x.golden} | 0 ...th-chain-external-sni.envoy-1-18-x.golden} | 0 ...external-sni.v2compat.envoy-1-16-x.golden} | 0 ...=> ingress-with-chain.envoy-1-18-x.golden} | 0 ...s-with-chain.v2compat.envoy-1-16-x.golden} | 0 ...ress-with-grpc-router.envoy-1-18-x.golden} | 0 ...-grpc-router.v2compat.envoy-1-16-x.golden} | 0 ...ith-resolver-redirect.envoy-1-18-x.golden} | 0 ...ver-redirect.v2compat.envoy-1-16-x.golden} | 0 ...ing-gateway-lb-config.envoy-1-18-x.golden} | 0 ...ay-lb-config.v2compat.envoy-1-16-x.golden} | 0 agent/xds/version_compat.go | 5 ++ ..._ADDR-with-https-scheme-enables-tls.golden | 2 +- .../envoy/testdata/access-log-path.golden | 2 +- .../connect/envoy/testdata/defaults.golden | 2 +- .../envoy/testdata/existing-ca-file.golden | 2 +- .../envoy/testdata/existing-ca-path.golden | 2 +- .../envoy/testdata/extra_-multiple.golden | 2 +- .../envoy/testdata/extra_-single.golden | 2 +- .../envoy/testdata/grpc-addr-config.golden | 2 +- .../envoy/testdata/grpc-addr-env.golden | 2 +- .../envoy/testdata/grpc-addr-flag.golden | 2 +- .../envoy/testdata/grpc-addr-unix.golden | 2 +- .../ingress-gateway-address-specified.golden | 2 +- .../ingress-gateway-no-auto-register.golden | 2 +- ...-register-with-service-and-proxy-id.golden | 2 +- ...ister-with-service-without-proxy-id.golden | 2 +- .../envoy/testdata/ingress-gateway.golden | 2 +- .../envoy/testdata/prometheus-metrics.golden | 2 +- .../testdata/stats-config-override.golden | 2 +- .../connect/envoy/testdata/token-arg.golden | 2 +- .../connect/envoy/testdata/token-env.golden | 2 +- .../envoy/testdata/token-file-arg.golden | 2 +- .../envoy/testdata/token-file-env.golden | 2 +- .../testdata/zipkin-tracing-config.golden | 2 +- .../connect/envoy/case-grpc/verify.bats | 8 +++- test/integration/connect/envoy/run-tests.sh | 2 +- .../connect/envoy/test-envoy-versions.sh | 48 ------------------- website/content/commands/connect/envoy.mdx | 2 +- .../content/docs/connect/proxies/envoy.mdx | 6 +-- 367 files changed, 169 insertions(+), 118 deletions(-) create mode 100644 .changelog/10101.txt rename agent/xds/testdata/clusters/{connect-proxy-lb-in-resolver.envoy-1-17-x.golden => connect-proxy-lb-in-resolver.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden => connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-failover.envoy-1-17-x.golden => connect-proxy-with-chain-and-failover.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-external-sni.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain.envoy-1-17-x.golden => connect-proxy-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits-max-connections-only.envoy-1-17-x.golden => custom-limits-max-connections-only.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits-max-connections-only.v2compat.envoy-1-17-x.golden => custom-limits-max-connections-only.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits-set-to-zero.envoy-1-17-x.golden => custom-limits-set-to-zero.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits-set-to-zero.v2compat.envoy-1-17-x.golden => custom-limits-set-to-zero.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits.envoy-1-17-x.golden => custom-limits.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-limits.v2compat.envoy-1-17-x.golden => custom-limits.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-local-app.envoy-1-17-x.golden => custom-local-app.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-local-app.v2compat.envoy-1-17-x.golden => custom-local-app.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-timeouts.envoy-1-17-x.golden => custom-timeouts.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-timeouts.v2compat.envoy-1-17-x.golden => custom-timeouts.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-upstream-default-chain.envoy-1-17-x.golden => custom-upstream-default-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-upstream-default-chain.v2compat.envoy-1-17-x.golden => custom-upstream-default-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-upstream.envoy-1-17-x.golden => custom-upstream.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{custom-upstream.v2compat.envoy-1-17-x.golden => custom-upstream.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{defaults.envoy-1-17-x.golden => defaults.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{defaults.v2compat.envoy-1-17-x.golden => defaults.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-grpc-new-cluster-http1.envoy-1-17-x.golden => expose-paths-grpc-new-cluster-http1.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-17-x.golden => expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-local-app-paths.envoy-1-17-x.golden => expose-paths-local-app-paths.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden => expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-new-cluster-http2.envoy-1-17-x.golden => expose-paths-new-cluster-http2.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden => expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-gateway-no-services.envoy-1-17-x.golden => ingress-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-gateway-no-services.v2compat.envoy-1-17-x.golden => ingress-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-gateway.envoy-1-17-x.golden => ingress-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-gateway.v2compat.envoy-1-17-x.golden => ingress-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-lb-in-resolver.envoy-1-17-x.golden => ingress-lb-in-resolver.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden => ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden => ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden => ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-and-failover.envoy-1-17-x.golden => ingress-with-chain-and-failover.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-and-overrides.envoy-1-17-x.golden => ingress-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-external-sni.envoy-1-17-x.golden => ingress-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden => ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain.envoy-1-17-x.golden => ingress-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-chain.v2compat.envoy-1-17-x.golden => ingress-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-hash-lb-ignored.envoy-1-17-x.golden => mesh-gateway-hash-lb-ignored.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-hash-lb-ignored.v2compat.envoy-1-17-x.golden => mesh-gateway-hash-lb-ignored.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-ignore-extra-resolvers.envoy-1-17-x.golden => mesh-gateway-ignore-extra-resolvers.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden => mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-no-services.envoy-1-17-x.golden => mesh-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-no-services.v2compat.envoy-1-17-x.golden => mesh-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-non-hash-lb-injected.envoy-1-17-x.golden => mesh-gateway-non-hash-lb-injected.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-17-x.golden => mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-service-subsets.envoy-1-17-x.golden => mesh-gateway-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden => mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-service-timeouts.envoy-1-17-x.golden => mesh-gateway-service-timeouts.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-service-timeouts.v2compat.envoy-1-17-x.golden => mesh-gateway-service-timeouts.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-using-federation-states.envoy-1-17-x.golden => mesh-gateway-using-federation-states.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden => mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway.envoy-1-17-x.golden => mesh-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{mesh-gateway.v2compat.envoy-1-17-x.golden => mesh-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{splitter-with-resolver-redirect.envoy-1-17-x.golden => splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-hostname-service-subsets.envoy-1-17-x.golden => terminating-gateway-hostname-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-hostname-service-subsets.v2compat.envoy-1-17-x.golden => terminating-gateway-hostname-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-ignore-extra-resolvers.envoy-1-17-x.golden => terminating-gateway-ignore-extra-resolvers.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden => terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-lb-config.envoy-1-17-x.golden => terminating-gateway-lb-config.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden => terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-no-services.envoy-1-17-x.golden => terminating-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-no-services.v2compat.envoy-1-17-x.golden => terminating-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-service-subsets.envoy-1-17-x.golden => terminating-gateway-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden => terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway.envoy-1-17-x.golden => terminating-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{terminating-gateway.v2compat.envoy-1-17-x.golden => terminating-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/clusters/{transparent-proxy.envoy-1-17-x.golden => transparent-proxy.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/clusters/{transparent-proxy.v2compat.envoy-1-17-x.golden => transparent-proxy.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-failover.envoy-1-17-x.golden => connect-proxy-with-chain-and-failover.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-external-sni.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain.envoy-1-17-x.golden => connect-proxy-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-default-chain-and-custom-cluster.envoy-1-17-x.golden => connect-proxy-with-default-chain-and-custom-cluster.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-17-x.golden => connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{defaults.envoy-1-17-x.golden => defaults.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{defaults.v2compat.envoy-1-17-x.golden => defaults.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-gateway-no-services.envoy-1-17-x.golden => ingress-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-gateway-no-services.v2compat.envoy-1-17-x.golden => ingress-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-gateway.envoy-1-17-x.golden => ingress-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-gateway.v2compat.envoy-1-17-x.golden => ingress-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden => ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden => ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-and-failover.envoy-1-17-x.golden => ingress-with-chain-and-failover.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-and-overrides.envoy-1-17-x.golden => ingress-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-external-sni.envoy-1-17-x.golden => ingress-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden => ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain.envoy-1-17-x.golden => ingress-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-chain.v2compat.envoy-1-17-x.golden => ingress-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-default-service-subset.envoy-1-17-x.golden => mesh-gateway-default-service-subset.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-default-service-subset.v2compat.envoy-1-17-x.golden => mesh-gateway-default-service-subset.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-no-services.envoy-1-17-x.golden => mesh-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-no-services.v2compat.envoy-1-17-x.golden => mesh-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-service-subsets.envoy-1-17-x.golden => mesh-gateway-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden => mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-using-federation-states.envoy-1-17-x.golden => mesh-gateway-using-federation-states.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden => mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway.envoy-1-17-x.golden => mesh-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{mesh-gateway.v2compat.envoy-1-17-x.golden => mesh-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{splitter-with-resolver-redirect.envoy-1-17-x.golden => splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-default-service-subset.envoy-1-17-x.golden => terminating-gateway-default-service-subset.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-default-service-subset.v2compat.envoy-1-17-x.golden => terminating-gateway-default-service-subset.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-no-services.envoy-1-17-x.golden => terminating-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-no-services.v2compat.envoy-1-17-x.golden => terminating-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-service-subsets.envoy-1-17-x.golden => terminating-gateway-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden => terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway.envoy-1-17-x.golden => terminating-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/endpoints/{terminating-gateway.v2compat.envoy-1-17-x.golden => terminating-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden} (95%) rename agent/xds/testdata/listeners/{connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (95%) rename agent/xds/testdata/listeners/{connect-proxy-with-chain-external-sni.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-grpc-chain.envoy-1-17-x.golden => connect-proxy-with-grpc-chain.envoy-1-18-x.golden} (95%) rename agent/xds/testdata/listeners/{connect-proxy-with-grpc-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-grpc-chain.v2compat.envoy-1-16-x.golden} (95%) rename agent/xds/testdata/listeners/{connect-proxy-with-http-chain.envoy-1-17-x.golden => connect-proxy-with-http-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-http-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-http-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-http2-chain.envoy-1-17-x.golden => connect-proxy-with-http2-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-http2-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-http2-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain.envoy-1-17-x.golden => connect-proxy-with-tcp-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-tcp-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http-2.envoy-1-17-x.golden => custom-public-listener-http-2.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http-2.v2compat.envoy-1-17-x.golden => custom-public-listener-http-2.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http-missing.envoy-1-17-x.golden => custom-public-listener-http-missing.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http-missing.v2compat.envoy-1-17-x.golden => custom-public-listener-http-missing.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http.envoy-1-17-x.golden => custom-public-listener-http.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener-http.v2compat.envoy-1-17-x.golden => custom-public-listener-http.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener.envoy-1-17-x.golden => custom-public-listener.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-public-listener.v2compat.envoy-1-17-x.golden => custom-public-listener.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-upstream-ignored-with-disco-chain.envoy-1-17-x.golden => custom-upstream-ignored-with-disco-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-17-x.golden => custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-upstream.envoy-1-17-x.golden => custom-upstream.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{custom-upstream.v2compat.envoy-1-17-x.golden => custom-upstream.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{defaults.envoy-1-17-x.golden => defaults.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{defaults.v2compat.envoy-1-17-x.golden => defaults.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-checks.envoy-1-17-x.golden => expose-checks.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-checks.v2compat.envoy-1-17-x.golden => expose-checks.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-paths-local-app-paths.envoy-1-17-x.golden => expose-paths-local-app-paths.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden => expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-paths-new-cluster-http2.envoy-1-17-x.golden => expose-paths-new-cluster-http2.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden => expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{http-listener-with-timeouts.envoy-1-17-x.golden => http-listener-with-timeouts.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{http-listener-with-timeouts.v2compat.envoy-1-17-x.golden => http-listener-with-timeouts.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{http-public-listener.envoy-1-17-x.golden => http-public-listener.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{http-public-listener.v2compat.envoy-1-17-x.golden => http-public-listener.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{http-upstream.envoy-1-17-x.golden => http-upstream.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{http-upstream.v2compat.envoy-1-17-x.golden => http-upstream.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway-bind-addrs.envoy-1-17-x.golden => ingress-gateway-bind-addrs.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway-bind-addrs.v2compat.envoy-1-17-x.golden => ingress-gateway-bind-addrs.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway-no-services.envoy-1-17-x.golden => ingress-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway-no-services.v2compat.envoy-1-17-x.golden => ingress-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway.envoy-1-17-x.golden => ingress-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-gateway.v2compat.envoy-1-17-x.golden => ingress-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-http-multiple-services.envoy-1-17-x.golden => ingress-http-multiple-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-http-multiple-services.v2compat.envoy-1-17-x.golden => ingress-http-multiple-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-chain-and-overrides.envoy-1-17-x.golden => ingress-with-chain-and-overrides.envoy-1-18-x.golden} (82%) rename agent/xds/testdata/listeners/{ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (82%) rename agent/xds/testdata/listeners/{ingress-with-chain-external-sni.envoy-1-17-x.golden => ingress-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden => ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tls-listener.envoy-1-17-x.golden => ingress-with-tls-listener.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{ingress-with-tls-listener.v2compat.envoy-1-17-x.golden => ingress-with-tls-listener.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-address-port.envoy-1-17-x.golden => listener-bind-address-port.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-address-port.v2compat.envoy-1-17-x.golden => listener-bind-address-port.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-address.envoy-1-17-x.golden => listener-bind-address.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-address.v2compat.envoy-1-17-x.golden => listener-bind-address.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-port.envoy-1-17-x.golden => listener-bind-port.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{listener-bind-port.v2compat.envoy-1-17-x.golden => listener-bind-port.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-custom-addresses.envoy-1-17-x.golden => mesh-gateway-custom-addresses.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-custom-addresses.v2compat.envoy-1-17-x.golden => mesh-gateway-custom-addresses.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-no-services.envoy-1-17-x.golden => mesh-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-no-services.v2compat.envoy-1-17-x.golden => mesh-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-tagged-addresses.envoy-1-17-x.golden => mesh-gateway-tagged-addresses.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-tagged-addresses.v2compat.envoy-1-17-x.golden => mesh-gateway-tagged-addresses.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-using-federation-states.envoy-1-17-x.golden => mesh-gateway-using-federation-states.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden => mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway.envoy-1-17-x.golden => mesh-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{mesh-gateway.v2compat.envoy-1-17-x.golden => mesh-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{splitter-with-resolver-redirect.envoy-1-17-x.golden => splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-custom-and-tagged-addresses.envoy-1-17-x.golden => terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-17-x.golden => terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-no-api-cert.envoy-1-17-x.golden => terminating-gateway-no-api-cert.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-no-api-cert.v2compat.envoy-1-17-x.golden => terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-no-services.envoy-1-17-x.golden => terminating-gateway-no-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-no-services.v2compat.envoy-1-17-x.golden => terminating-gateway-no-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-service-subsets.envoy-1-17-x.golden => terminating-gateway-service-subsets.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden => terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway.envoy-1-17-x.golden => terminating-gateway.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{terminating-gateway.v2compat.envoy-1-17-x.golden => terminating-gateway.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{transparent-proxy-catalog-destinations-only.envoy-1-17-x.golden => transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{transparent-proxy-catalog-destinations-only.v2compat.envoy-1-17-x.golden => transparent-proxy-catalog-destinations-only.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/listeners/{transparent-proxy.envoy-1-17-x.golden => transparent-proxy.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/listeners/{transparent-proxy.v2compat.envoy-1-17-x.golden => transparent-proxy.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-lb-in-resolver.envoy-1-17-x.golden => connect-proxy-lb-in-resolver.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden => connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-router.envoy-1-17-x.golden => connect-proxy-with-chain-and-router.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-router.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-router.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-splitter.envoy-1-17-x.golden => connect-proxy-with-chain-and-splitter.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-splitter.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-and-splitter.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-external-sni.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain.envoy-1-17-x.golden => connect-proxy-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-chain.v2compat.envoy-1-17-x.golden => connect-proxy-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-grpc-router.envoy-1-17-x.golden => connect-proxy-with-grpc-router.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{connect-proxy-with-grpc-router.v2compat.envoy-1-17-x.golden => connect-proxy-with-grpc-router.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{defaults-no-chain.envoy-1-17-x.golden => defaults-no-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{defaults-no-chain.v2compat.envoy-1-17-x.golden => defaults-no-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-defaults-no-chain.envoy-1-17-x.golden => ingress-defaults-no-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-defaults-no-chain.v2compat.envoy-1-17-x.golden => ingress-defaults-no-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-http-multiple-services.envoy-1-17-x.golden => ingress-http-multiple-services.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-http-multiple-services.v2compat.envoy-1-17-x.golden => ingress-http-multiple-services.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-lb-in-resolver.envoy-1-17-x.golden => ingress-lb-in-resolver.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden => ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-overrides.envoy-1-17-x.golden => ingress-with-chain-and-overrides.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-router.envoy-1-17-x.golden => ingress-with-chain-and-router.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-router.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-router.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-splitter.envoy-1-17-x.golden => ingress-with-chain-and-splitter.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-and-splitter.v2compat.envoy-1-17-x.golden => ingress-with-chain-and-splitter.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-external-sni.envoy-1-17-x.golden => ingress-with-chain-external-sni.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden => ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain.envoy-1-17-x.golden => ingress-with-chain.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-chain.v2compat.envoy-1-17-x.golden => ingress-with-chain.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-grpc-router.envoy-1-17-x.golden => ingress-with-grpc-router.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{ingress-with-grpc-router.v2compat.envoy-1-17-x.golden => ingress-with-grpc-router.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{splitter-with-resolver-redirect.envoy-1-17-x.golden => splitter-with-resolver-redirect.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden => splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden} (100%) rename agent/xds/testdata/routes/{terminating-gateway-lb-config.envoy-1-17-x.golden => terminating-gateway-lb-config.envoy-1-18-x.golden} (100%) rename agent/xds/testdata/routes/{terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden => terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden} (100%) delete mode 100755 test/integration/connect/envoy/test-envoy-versions.sh diff --git a/.changelog/10101.txt b/.changelog/10101.txt new file mode 100644 index 0000000000..897133a408 --- /dev/null +++ b/.changelog/10101.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: update supported envoy versions to 1.18.2, 1.17.2, 1.16.3, 1.15.4 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index 311e26cfce..444434abe9 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -767,14 +767,14 @@ jobs: command: make test-coverage-ci - run: *notify-slack-failure - envoy-integration-test-1_14_6: &ENVOY_TESTS + envoy-integration-test-1_15_4: &ENVOY_TESTS docker: # We only really need bash and docker-compose which is installed on all # Circle images but pick Go since we have to pick one of them. - image: *GOLANG_IMAGE parallelism: 2 environment: - ENVOY_VERSION: "1.14.6" + ENVOY_VERSION: "1.15.4" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -807,38 +807,32 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1_14_6-v2compat: + envoy-integration-test-1_15_4-v2compat: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.14.6" + ENVOY_VERSION: "1.15.4" TEST_V2_XDS: "1" - envoy-integration-test-1_15_3: + envoy-integration-test-1_16_3: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.15.3" + ENVOY_VERSION: "1.16.3" - envoy-integration-test-1_15_3-v2compat: + envoy-integration-test-1_16_3-v2compat: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.15.3" + ENVOY_VERSION: "1.16.3" TEST_V2_XDS: "1" - envoy-integration-test-1_16_2: + envoy-integration-test-1_17_2: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.2" + ENVOY_VERSION: "1.17.2" - envoy-integration-test-1_16_2-v2compat: + envoy-integration-test-1_18_2: <<: *ENVOY_TESTS environment: - ENVOY_VERSION: "1.16.2" - TEST_V2_XDS: "1" - - envoy-integration-test-1_17_0: - <<: *ENVOY_TESTS - environment: - ENVOY_VERSION: "1.17.0" + ENVOY_VERSION: "1.18.2" # run integration tests for the connect ca providers test-connect-ca-providers: @@ -1047,25 +1041,22 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1_14_6: + - envoy-integration-test-1_15_4: requires: - dev-build - - envoy-integration-test-1_14_6-v2compat: + - envoy-integration-test-1_15_4-v2compat: requires: - dev-build - - envoy-integration-test-1_15_3: + - envoy-integration-test-1_16_3: requires: - dev-build - - envoy-integration-test-1_15_3-v2compat: + - envoy-integration-test-1_16_3-v2compat: requires: - dev-build - - envoy-integration-test-1_16_2: + - envoy-integration-test-1_17_2: requires: - dev-build - - envoy-integration-test-1_16_2-v2compat: - requires: - - dev-build - - envoy-integration-test-1_17_0: + - envoy-integration-test-1_18_2: requires: - dev-build diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go index a0e69f607a..1e7f4ddaa7 100644 --- a/agent/xds/clusters_test.go +++ b/agent/xds/clusters_test.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/proxysupport" + "github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/sdk/testutil" ) @@ -642,6 +643,7 @@ func TestClustersFromSnapshot(t *testing.T) { } latestEnvoyVersion := proxysupport.EnvoyVersions[0] + latestEnvoyVersion_v2 := proxysupport.EnvoyVersionsV2[0] for _, envoyVersion := range proxysupport.EnvoyVersions { sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) @@ -686,6 +688,9 @@ func TestClustersFromSnapshot(t *testing.T) { }) t.Run("v2-compat", func(t *testing.T) { + if !stringslice.Contains(proxysupport.EnvoyVersionsV2, envoyVersion) { + t.Skip() + } respV2, err := convertDiscoveryResponseToV2(r) require.NoError(t, err) @@ -698,7 +703,7 @@ func TestClustersFromSnapshot(t *testing.T) { gName += ".v2compat" - require.JSONEq(t, goldenEnvoy(t, filepath.Join("clusters", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON) + require.JSONEq(t, goldenEnvoy(t, filepath.Join("clusters", gName), envoyVersion, latestEnvoyVersion_v2, gotJSON), gotJSON) }) }) } diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go index 94e1062694..9bdb181136 100644 --- a/agent/xds/endpoints_test.go +++ b/agent/xds/endpoints_test.go @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/proxysupport" + "github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/sdk/testutil" ) @@ -566,6 +567,7 @@ func TestEndpointsFromSnapshot(t *testing.T) { } latestEnvoyVersion := proxysupport.EnvoyVersions[0] + latestEnvoyVersion_v2 := proxysupport.EnvoyVersionsV2[0] for _, envoyVersion := range proxysupport.EnvoyVersions { sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) @@ -609,6 +611,9 @@ func TestEndpointsFromSnapshot(t *testing.T) { }) t.Run("v2-compat", func(t *testing.T) { + if !stringslice.Contains(proxysupport.EnvoyVersionsV2, envoyVersion) { + t.Skip() + } respV2, err := convertDiscoveryResponseToV2(r) require.NoError(t, err) @@ -621,7 +626,7 @@ func TestEndpointsFromSnapshot(t *testing.T) { gName += ".v2compat" - require.JSONEq(t, goldenEnvoy(t, filepath.Join("endpoints", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON) + require.JSONEq(t, goldenEnvoy(t, filepath.Join("endpoints", gName), envoyVersion, latestEnvoyVersion_v2, gotJSON), gotJSON) }) }) } diff --git a/agent/xds/envoy_versioning.go b/agent/xds/envoy_versioning.go index 35c42723a6..0e218ad659 100644 --- a/agent/xds/envoy_versioning.go +++ b/agent/xds/envoy_versioning.go @@ -11,7 +11,7 @@ import ( var ( // minSupportedVersion is the oldest mainline version we support. This should always be // the zero'th point release of the last element of proxysupport.EnvoyVersions. - minSupportedVersion = version.Must(version.NewVersion("1.14.0")) + minSupportedVersion = version.Must(version.NewVersion("1.15.0")) minVersionAllowingEmptyGatewayClustersWithIncrementalXDS = version.Must(version.NewVersion("1.16.0")) minVersionAllowingMultipleIncrementalXDSChanges = version.Must(version.NewVersion("1.16.0")) diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index 4a2f6439ad..c292eb6c2c 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -98,12 +98,19 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { "1.13.5": {expectErr: "Envoy 1.13.5 " + errTooOld}, "1.13.6": {expectErr: "Envoy 1.13.6 " + errTooOld}, "1.13.7": {expectErr: "Envoy 1.13.7 " + errTooOld}, + "1.14.0": {expectErr: "Envoy 1.14.0 " + errTooOld}, + "1.14.1": {expectErr: "Envoy 1.14.1 " + errTooOld}, + "1.14.2": {expectErr: "Envoy 1.14.2 " + errTooOld}, + "1.14.3": {expectErr: "Envoy 1.14.3 " + errTooOld}, + "1.14.4": {expectErr: "Envoy 1.14.4 " + errTooOld}, + "1.14.5": {expectErr: "Envoy 1.14.5 " + errTooOld}, + "1.14.6": {expectErr: "Envoy 1.14.6 " + errTooOld}, + "1.14.7": {expectErr: "Envoy 1.14.7 " + errTooOld}, } // Insert a bunch of valid versions. for _, v := range []string{ - "1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.14.5", "1.14.6", - "1.15.0", "1.15.1", "1.15.2", "1.15.3", + "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", } { cases[v] = testcase{expect: supportedProxyFeatures{ GatewaysNeedStubClusterWhenEmptyWithIncrementalXDS: true, @@ -111,8 +118,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { }} } for _, v := range []string{ - "1.16.0", "1.16.1", "1.16.2", - "1.17.0", + "1.16.0", "1.16.1", "1.16.2", "1.16.3", + "1.17.0", "1.17.1", "1.17.2", + "1.18.0", "1.18.1", "1.18.2", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/listeners.go b/agent/xds/listeners.go index 6b658e3337..85046c0904 100644 --- a/agent/xds/listeners.go +++ b/agent/xds/listeners.go @@ -14,11 +14,11 @@ import ( envoy_core_v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" envoy_listener_v3 "github.com/envoyproxy/go-control-plane/envoy/config/listener/v3" envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" + envoy_grpc_stats_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3" envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" envoy_tcp_proxy_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/tcp_proxy/v3" envoy_tls_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/transport_sockets/tls/v3" envoy_type_v3 "github.com/envoyproxy/go-control-plane/envoy/type/v3" - "github.com/hashicorp/consul/sdk/iptables" "github.com/golang/protobuf/jsonpb" "github.com/golang/protobuf/proto" @@ -29,6 +29,7 @@ import ( "github.com/hashicorp/consul/agent/connect" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" + "github.com/hashicorp/consul/sdk/iptables" ) // listenersFromSnapshot returns the xDS API representation of the "listeners" in the snapshot. @@ -1581,6 +1582,24 @@ func makeHTTPFilter(opts listenerFilterOpts) (*envoy_listener_v3.Filter, error) cfg.HttpFilters = append([]*envoy_http_v3.HttpFilter{{ Name: "envoy.filters.http.grpc_http1_bridge", }}, cfg.HttpFilters...) + + // In envoy 1.14.x the default value "stats_for_all_methods=true" was + // deprecated, and was changed to "false" in 1.18.x. Avoid using the + // default. TODO: we may want to expose this to users somehow easily. + grpcStatsFilter, err := makeEnvoyHTTPFilter( + "envoy.filters.http.grpc_stats", + &envoy_grpc_stats_v3.FilterConfig{ + PerMethodStatSpecifier: &envoy_grpc_stats_v3.FilterConfig_StatsForAllMethods{ + StatsForAllMethods: makeBoolValue(true), + }, + }, + ) + if err != nil { + return nil, err + } + cfg.HttpFilters = append([]*envoy_http_v3.HttpFilter{ + grpcStatsFilter, + }, cfg.HttpFilters...) } return makeFilter("envoy.filters.network.http_connection_manager", cfg) diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go index 2f9102f42a..28b51fd177 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_test.go @@ -18,6 +18,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/proxysupport" + "github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/sdk/testutil" "github.com/hashicorp/consul/types" ) @@ -554,6 +555,7 @@ func TestListenersFromSnapshot(t *testing.T) { } latestEnvoyVersion := proxysupport.EnvoyVersions[0] + latestEnvoyVersion_v2 := proxysupport.EnvoyVersionsV2[0] for _, envoyVersion := range proxysupport.EnvoyVersions { sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) @@ -603,6 +605,9 @@ func TestListenersFromSnapshot(t *testing.T) { }) t.Run("v2-compat", func(t *testing.T) { + if !stringslice.Contains(proxysupport.EnvoyVersionsV2, envoyVersion) { + t.Skip() + } respV2, err := convertDiscoveryResponseToV2(r) require.NoError(t, err) @@ -615,7 +620,7 @@ func TestListenersFromSnapshot(t *testing.T) { gName += ".v2compat" - require.JSONEq(t, goldenEnvoy(t, filepath.Join("listeners", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON) + require.JSONEq(t, goldenEnvoy(t, filepath.Join("listeners", gName), envoyVersion, latestEnvoyVersion_v2, gotJSON), gotJSON) }) }) } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index 63130aaf46..350569601f 100644 --- a/agent/xds/proxysupport/proxysupport.go +++ b/agent/xds/proxysupport/proxysupport.go @@ -7,8 +7,13 @@ package proxysupport // // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions var EnvoyVersions = []string{ - "1.17.0", - "1.16.2", - "1.15.3", - "1.14.6", + "1.18.2", + "1.17.2", + "1.16.3", + "1.15.4", +} + +var EnvoyVersionsV2 = []string{ + "1.16.3", + "1.15.4", } diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go index eb1118c1fa..005a4a9fe9 100644 --- a/agent/xds/routes_test.go +++ b/agent/xds/routes_test.go @@ -17,6 +17,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds/proxysupport" + "github.com/hashicorp/consul/lib/stringslice" "github.com/hashicorp/consul/sdk/testutil" ) @@ -238,6 +239,7 @@ func TestRoutesFromSnapshot(t *testing.T) { } latestEnvoyVersion := proxysupport.EnvoyVersions[0] + latestEnvoyVersion_v2 := proxysupport.EnvoyVersionsV2[0] for _, envoyVersion := range proxysupport.EnvoyVersions { sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) require.NoError(t, err) @@ -280,6 +282,9 @@ func TestRoutesFromSnapshot(t *testing.T) { }) t.Run("v2-compat", func(t *testing.T) { + if !stringslice.Contains(proxysupport.EnvoyVersionsV2, envoyVersion) { + t.Skip() + } respV2, err := convertDiscoveryResponseToV2(r) require.NoError(t, err) @@ -292,7 +297,7 @@ func TestRoutesFromSnapshot(t *testing.T) { gName += ".v2compat" - require.JSONEq(t, goldenEnvoy(t, filepath.Join("routes", gName), envoyVersion, latestEnvoyVersion, gotJSON), gotJSON) + require.JSONEq(t, goldenEnvoy(t, filepath.Join("routes", gName), envoyVersion, latestEnvoyVersion_v2, gotJSON), gotJSON) }) }) } diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-limits.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-limits.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-local-app.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-local-app.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-timeouts.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/custom-upstream.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/custom-upstream.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-17-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/defaults.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/defaults.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/defaults.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/defaults.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/mesh-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/terminating-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy.envoy-1-17-x.golden b/agent/xds/testdata/clusters/transparent-proxy.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/transparent-proxy.envoy-1-18-x.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/clusters/transparent-proxy.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/clusters/transparent-proxy.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/defaults.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/defaults.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/defaults.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/defaults.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden similarity index 95% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden index dd2d7f528b..c62f2d49e5 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 95% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden index c4dde40f85..66dff063cd 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-18-x.golden similarity index 95% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-18-x.golden index dd2d7f528b..c62f2d49e5 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-18-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-16-x.golden similarity index 95% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-16-x.golden index c4dde40f85..66dff063cd 100644 --- a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.v2compat.envoy-1-16-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-2.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-2.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-public-listener.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/custom-upstream.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/custom-upstream.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-17-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/defaults.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/defaults.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/defaults.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/defaults.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/expose-checks.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-checks.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-checks.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-checks.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/expose-checks.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-checks.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-checks.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-checks.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-listener-with-timeouts.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-listener-with-timeouts.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-public-listener.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-public-listener.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-upstream.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/http-upstream.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/http-upstream.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/http-upstream.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-18-x.golden similarity index 82% rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-18-x.golden index 2d7b49890f..46383d61a8 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-18-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.extensions.filters.http.grpc_stats.v3.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 82% rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden index fcfa9043a7..6f011b9a72 100644 --- a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden +++ b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden @@ -28,6 +28,13 @@ "routeConfigName": "db" }, "httpFilters": [ + { + "name": "envoy.filters.http.grpc_stats", + "typedConfig": { + "@type": "type.googleapis.com/envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig", + "statsForAllMethods": true + } + }, { "name": "envoy.filters.http.grpc_http1_bridge" }, diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-address.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/listener-bind-port.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/mesh-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-17-x.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy.envoy-1-17-x.golden b/agent/xds/testdata/listeners/transparent-proxy.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/transparent-proxy.envoy-1-18-x.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/listeners/transparent-proxy.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/listeners/transparent-proxy.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-17-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-17-x.golden rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/defaults-no-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/defaults-no-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/defaults-no-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/defaults-no-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-lb-in-resolver.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-lb-in-resolver.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-chain.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-17-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-17-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-18-x.golden similarity index 100% rename from agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden rename to agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-18-x.golden diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden similarity index 100% rename from agent/xds/testdata/routes/terminating-gateway-lb-config.v2compat.envoy-1-17-x.golden rename to agent/xds/testdata/routes/terminating-gateway-lb-config.v2compat.envoy-1-16-x.golden diff --git a/agent/xds/version_compat.go b/agent/xds/version_compat.go index d0d02e5dd9..aa4ad55eb2 100644 --- a/agent/xds/version_compat.go +++ b/agent/xds/version_compat.go @@ -11,6 +11,7 @@ import ( envoy_route_v2 "github.com/envoyproxy/go-control-plane/envoy/api/v2/route" envoy_cluster_v3 "github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3" envoy_endpoint_v3 "github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3" + envoy_grpc_stats_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha" envoy_http_rbac_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2" envoy_tls_inspector_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/tls_inspector/v2" envoy_http_v2 "github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2" @@ -23,6 +24,7 @@ import ( envoy_route_v3 "github.com/envoyproxy/go-control-plane/envoy/config/route/v3" envoy_trace_v2 "github.com/envoyproxy/go-control-plane/envoy/config/trace/v2" envoy_trace_v3 "github.com/envoyproxy/go-control-plane/envoy/config/trace/v3" + envoy_grpc_stats_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3" envoy_http_rbac_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3" envoy_tls_inspector_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3" envoy_http_v3 "github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3" @@ -492,6 +494,8 @@ func convertTypedConfigsToV2(pb proto.Message) error { return nil case *envoy_tls_v2.DownstreamTlsContext: return nil + case *envoy_grpc_stats_v2.FilterConfig: + return nil default: return fmt.Errorf("could not convert unexpected type to v2: %T", pb) } @@ -577,4 +581,5 @@ func init() { reg2(&envoy_metrics_v2.DogStatsdSink{}, &envoy_metrics_v3.DogStatsdSink{}) reg2(&envoy_metrics_v2.StatsdSink{}, &envoy_metrics_v3.StatsdSink{}) reg2(&envoy_trace_v2.ZipkinConfig{}, &envoy_trace_v3.ZipkinConfig{}) + reg2(&envoy_grpc_stats_v2.FilterConfig{}, &envoy_grpc_stats_v3.FilterConfig{}) } 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 0b2d8985fb..3d83d6589d 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 @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 34ce4c6588..ea129a3ec6 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 43930e4487..774aed3df3 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 9ac822924c..2c277d9949 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden index 4735ee8a19..2e879d1e1c 100644 --- a/command/connect/envoy/testdata/existing-ca-path.golden +++ b/command/connect/envoy/testdata/existing-ca-path.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index 8b8222dcc4..62b6a79a70 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 096abaa656..a02eaa9043 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index cd8daf3cbe..5f1ff4d7c8 100644 --- a/command/connect/envoy/testdata/grpc-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-addr-config.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index cd8daf3cbe..5f1ff4d7c8 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index cd8daf3cbe..5f1ff4d7c8 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 8d64661527..0c321edca9 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "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 e7773accbb..fe6f987cab 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "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 c1dba5684e..e6a956ee6e 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "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 fcdb940866..d8f46383f3 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 @@ -13,7 +13,7 @@ "id": "my-gateway-123", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "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 220e462272..90cb17c163 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 @@ -13,7 +13,7 @@ "id": "my-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index eadb855908..ebc1f4d4f4 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway-1", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/prometheus-metrics.golden b/command/connect/envoy/testdata/prometheus-metrics.golden index 46d4551793..beb779a356 100644 --- a/command/connect/envoy/testdata/prometheus-metrics.golden +++ b/command/connect/envoy/testdata/prometheus-metrics.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 2170412631..3043e6934a 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 98c72478f2..081f6c3024 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 98c72478f2..081f6c3024 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 98c72478f2..081f6c3024 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 98c72478f2..081f6c3024 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 4219c58d31..b64783ebe2 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.17.0" + "envoy_version": "1.18.2" } }, "static_resources": { diff --git a/test/integration/connect/envoy/case-grpc/verify.bats b/test/integration/connect/envoy/case-grpc/verify.bats index 33d9db8ad8..422258a0c0 100644 --- a/test/integration/connect/envoy/case-grpc/verify.bats +++ b/test/integration/connect/envoy/case-grpc/verify.bats @@ -37,7 +37,13 @@ load helpers } @test "s1 proxy should be sending gRPC metrics to statsd" { - run retry_default must_match_in_statsd_logs 'envoy.cluster.grpc.PingServer.total.*[#,]local_cluster:s1(,|$)' + # in envoy 1.18.x the format of the emitted grpc metrics changed slightly + metrics_query='envoy.cluster.grpc.fgrpc.PingServer.Ping.total.*[#,]local_cluster:s1(,|$)' + if [[ "${ENVOY_VERSION}" =~ ^1\.1[567]\. ]]; then + metrics_query='envoy.cluster.grpc.PingServer.total.*[#,]local_cluster:s1(,|$)' + fi + + run retry_default must_match_in_statsd_logs "${metrics_query}" echo "OUTPUT: $output" [ "$status" == 0 ] diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index d8adaa6184..d0907a7890 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.17.0"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.18.2"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then diff --git a/test/integration/connect/envoy/test-envoy-versions.sh b/test/integration/connect/envoy/test-envoy-versions.sh deleted file mode 100755 index 88f8b45501..0000000000 --- a/test/integration/connect/envoy/test-envoy-versions.sh +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/bash - -set -euo pipefail - -unset CDPATH - -cd "$(dirname "$0")" - -## no rbac url_path support - # 1.13.0 - -## does not exist in docker - # 1.13.5 - # 1.14.0 - -## doesn't fully support the renamed filters - # 1.13.1 - # 1.13.2 - # 1.13.3 - # 1.13.4 - # 1.13.5 - # 1.13.7 - # 1.13.6 - # 1.13.7 - -versions=( - 1.14.1 - 1.14.2 - 1.14.3 - 1.14.4 - 1.14.5 - 1.14.6 - 1.15.0 - 1.15.1 - 1.15.2 - 1.15.3 - 1.16.0 - 1.16.1 - 1.16.2 - 1.17.0 -) - -set +e -for v in "${versions[@]}"; do - echo "ENVOY_VERSION=${v}" - export ENVOY_VERSION="${v}" - go test -tags integration "$@" -done diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx index 9492dbc683..5adbabdb86 100644 --- a/website/content/commands/connect/envoy.mdx +++ b/website/content/commands/connect/envoy.mdx @@ -74,7 +74,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.17.0`. This is required so that the correct configuration can be generated. + `1.18.2`. 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 cc54138c4d..ac7e6cf181 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -34,9 +34,9 @@ compatible Envoy versions. | Consul Version | Compatible Envoy Versions | | ------------------- | -------------------------------- | -| 1.10.x | 1.17.0, 1.16.2, 1.15.3, 1.14.6‡, | -| 1.9.x | 1.16.2, 1.15.3, 1.14.6‡, 1.13.7‡ | -| 1.8.x | 1.14.6, 1.13.7, 1.12.7, 1.11.2 | +| 1.10.x | 1.18.2, 1.17.2, 1.16.3, 1.15.4 | +| 1.9.x | 1.16.3, 1.15.4, 1.14.7‡, 1.13.7‡ | +| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 | | 1.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0\* | | 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0† | | 1.5.1, 1.5.0 | 1.9.1, 1.8.0† |