From ca9f3d2bc75cb26d89e3a08572dd70b14c77bece Mon Sep 17 00:00:00 2001 From: "R.B. Boyer" Date: Fri, 23 Apr 2021 09:35:56 -0500 Subject: [PATCH] xds: update supported envoy versions to 1.18.2, 1.17.2, 1.16.3, and 1.15.4 --- .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 +- .../http/grpc_stats/v2alpha/config.pb.go | 203 +++++++++++++++++ .../grpc_stats/v2alpha/config.pb.validate.go | 201 +++++++++++++++++ .../filters/http/grpc_stats/v3/config.pb.go | 204 ++++++++++++++++++ .../http/grpc_stats/v3/config.pb.validate.go | 201 +++++++++++++++++ vendor/modules.txt | 2 + website/content/commands/connect/envoy.mdx | 2 +- .../content/docs/connect/proxies/envoy.mdx | 8 +- 370 files changed, 978 insertions(+), 71 deletions(-) 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%) create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go create mode 100644 vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go diff --git a/.circleci/config.yml b/.circleci/config.yml index b4f98c96c9379..d8e9b07ed4844 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -779,14 +779,14 @@ jobs: command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui - 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 @@ -819,38 +819,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: @@ -1060,25 +1054,22 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1_14_6: - requires: - - dev-build - - envoy-integration-test-1_14_6-v2compat: + - envoy-integration-test-1_15_4: requires: - dev-build - - envoy-integration-test-1_15_3: + - envoy-integration-test-1_15_4-v2compat: requires: - dev-build - - envoy-integration-test-1_15_3-v2compat: + - envoy-integration-test-1_16_3: requires: - dev-build - - envoy-integration-test-1_16_2: + - envoy-integration-test-1_16_3-v2compat: requires: - dev-build - - envoy-integration-test-1_16_2-v2compat: + - envoy-integration-test-1_17_2: 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 6e82ca946e2d8..79443dbba20e2 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) @@ -689,6 +691,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) @@ -701,7 +706,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 d85eb3aac3d8a..2fddd79fb46e8 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) @@ -612,6 +614,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) @@ -624,7 +629,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 30a642e99954a..0d46b32ab6911 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")) specificUnsupportedVersions = []unsupportedVersion{} ) diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index cb7a9cb57e5e3..cc957b1ba22a2 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -98,14 +98,22 @@ 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.16.0", "1.16.1", "1.16.2", - "1.17.0", + "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", + "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 4fbdef07d6d7b..6b5acf4410bcd 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" @@ -31,6 +31,7 @@ import ( "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/logging" + "github.com/hashicorp/consul/sdk/iptables" ) // listenersFromSnapshot returns the xDS API representation of the "listeners" in the snapshot. @@ -1588,6 +1589,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"e 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 1bc307c56a41a..502cf7aaf86ad 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_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" "github.com/hashicorp/consul/types" ) @@ -553,6 +554,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) @@ -605,6 +607,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) @@ -617,7 +622,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 63130aaf46c61..350569601f8cd 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 7311e92ae3a80..e2906f455361d 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) @@ -282,6 +284,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) @@ -294,7 +299,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 dd2d7f528b572..c62f2d49e5fd6 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 c4dde40f85642..66dff063cd3c2 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 dd2d7f528b572..c62f2d49e5fd6 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 c4dde40f85642..66dff063cd3c2 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 2d7b49890f84a..46383d61a844a 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 fcfa9043a724c..6f011b9a725e5 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 87880b87e3f2f..db65e0ab24065 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" @@ -400,6 +402,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) } @@ -485,4 +489,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 b13b4da04338a..5a7f66c3b08fc 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 21c827d8156b9..7c26d263c9bf3 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 1bb73227a1d68..28ab825b5d187 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 04e268b291361..09018c2e6f61b 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 29b05398a01e4..c2bc302b3b2a3 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 5fffe62eeef86..0f0167178db20 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 e839bc811d772..b499f37e472d2 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 6e1b003822d2d..d1ac0ce97b0d9 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 6e1b003822d2d..d1ac0ce97b0d9 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 6e1b003822d2d..d1ac0ce97b0d9 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 20730ff9b44a7..fbdade1b7cd2c 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 9676c0de3bc7a..3e5fdc6b26de8 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 d454e8caa93d2..050e2b8fe68c5 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 345d22e34308c..ee33b3668f6d9 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 1976535c65334..2c581e90af40b 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 05a7e2f8e9f07..e5571ab394949 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 8d1e1be750ec0..f4e063b9e52c7 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 674cf1adf3bef..72515c2523eb0 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 0a5e88b54bd66..f1f171e83b2f6 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 0a5e88b54bd66..f1f171e83b2f6 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 0a5e88b54bd66..f1f171e83b2f6 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 0a5e88b54bd66..f1f171e83b2f6 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 8ffaec2ce4961..271da15bbc70c 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 33d9db8ad8e30..422258a0c0ef7 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 b08cd924c5c50..fc855999fdc5c 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/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go new file mode 100644 index 0000000000000..b33d46b37192a --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.go @@ -0,0 +1,203 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: envoy/config/filter/http/grpc_stats/v2alpha/config.proto + +package envoy_config_filter_http_grpc_stats_v2alpha + +import ( + fmt "fmt" + _ "github.com/cncf/udpa/go/udpa/annotations" + core "github.com/envoyproxy/go-control-plane/envoy/api/v2/core" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + proto "github.com/golang/protobuf/proto" + wrappers "github.com/golang/protobuf/ptypes/wrappers" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +type FilterConfig struct { + EmitFilterState bool `protobuf:"varint,1,opt,name=emit_filter_state,json=emitFilterState,proto3" json:"emit_filter_state,omitempty"` + // Types that are valid to be assigned to PerMethodStatSpecifier: + // *FilterConfig_IndividualMethodStatsAllowlist + // *FilterConfig_StatsForAllMethods + PerMethodStatSpecifier isFilterConfig_PerMethodStatSpecifier `protobuf_oneof:"per_method_stat_specifier"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FilterConfig) Reset() { *m = FilterConfig{} } +func (m *FilterConfig) String() string { return proto.CompactTextString(m) } +func (*FilterConfig) ProtoMessage() {} +func (*FilterConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_1419fab6b23f453d, []int{0} +} + +func (m *FilterConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FilterConfig.Unmarshal(m, b) +} +func (m *FilterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FilterConfig.Marshal(b, m, deterministic) +} +func (m *FilterConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilterConfig.Merge(m, src) +} +func (m *FilterConfig) XXX_Size() int { + return xxx_messageInfo_FilterConfig.Size(m) +} +func (m *FilterConfig) XXX_DiscardUnknown() { + xxx_messageInfo_FilterConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_FilterConfig proto.InternalMessageInfo + +func (m *FilterConfig) GetEmitFilterState() bool { + if m != nil { + return m.EmitFilterState + } + return false +} + +type isFilterConfig_PerMethodStatSpecifier interface { + isFilterConfig_PerMethodStatSpecifier() +} + +type FilterConfig_IndividualMethodStatsAllowlist struct { + IndividualMethodStatsAllowlist *core.GrpcMethodList `protobuf:"bytes,2,opt,name=individual_method_stats_allowlist,json=individualMethodStatsAllowlist,proto3,oneof"` +} + +type FilterConfig_StatsForAllMethods struct { + StatsForAllMethods *wrappers.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` +} + +func (*FilterConfig_IndividualMethodStatsAllowlist) isFilterConfig_PerMethodStatSpecifier() {} + +func (*FilterConfig_StatsForAllMethods) isFilterConfig_PerMethodStatSpecifier() {} + +func (m *FilterConfig) GetPerMethodStatSpecifier() isFilterConfig_PerMethodStatSpecifier { + if m != nil { + return m.PerMethodStatSpecifier + } + return nil +} + +func (m *FilterConfig) GetIndividualMethodStatsAllowlist() *core.GrpcMethodList { + if x, ok := m.GetPerMethodStatSpecifier().(*FilterConfig_IndividualMethodStatsAllowlist); ok { + return x.IndividualMethodStatsAllowlist + } + return nil +} + +func (m *FilterConfig) GetStatsForAllMethods() *wrappers.BoolValue { + if x, ok := m.GetPerMethodStatSpecifier().(*FilterConfig_StatsForAllMethods); ok { + return x.StatsForAllMethods + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*FilterConfig) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*FilterConfig_IndividualMethodStatsAllowlist)(nil), + (*FilterConfig_StatsForAllMethods)(nil), + } +} + +type FilterObject struct { + RequestMessageCount uint64 `protobuf:"varint,1,opt,name=request_message_count,json=requestMessageCount,proto3" json:"request_message_count,omitempty"` + ResponseMessageCount uint64 `protobuf:"varint,2,opt,name=response_message_count,json=responseMessageCount,proto3" json:"response_message_count,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FilterObject) Reset() { *m = FilterObject{} } +func (m *FilterObject) String() string { return proto.CompactTextString(m) } +func (*FilterObject) ProtoMessage() {} +func (*FilterObject) Descriptor() ([]byte, []int) { + return fileDescriptor_1419fab6b23f453d, []int{1} +} + +func (m *FilterObject) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FilterObject.Unmarshal(m, b) +} +func (m *FilterObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FilterObject.Marshal(b, m, deterministic) +} +func (m *FilterObject) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilterObject.Merge(m, src) +} +func (m *FilterObject) XXX_Size() int { + return xxx_messageInfo_FilterObject.Size(m) +} +func (m *FilterObject) XXX_DiscardUnknown() { + xxx_messageInfo_FilterObject.DiscardUnknown(m) +} + +var xxx_messageInfo_FilterObject proto.InternalMessageInfo + +func (m *FilterObject) GetRequestMessageCount() uint64 { + if m != nil { + return m.RequestMessageCount + } + return 0 +} + +func (m *FilterObject) GetResponseMessageCount() uint64 { + if m != nil { + return m.ResponseMessageCount + } + return 0 +} + +func init() { + proto.RegisterType((*FilterConfig)(nil), "envoy.config.filter.http.grpc_stats.v2alpha.FilterConfig") + proto.RegisterType((*FilterObject)(nil), "envoy.config.filter.http.grpc_stats.v2alpha.FilterObject") +} + +func init() { + proto.RegisterFile("envoy/config/filter/http/grpc_stats/v2alpha/config.proto", fileDescriptor_1419fab6b23f453d) +} + +var fileDescriptor_1419fab6b23f453d = []byte{ + // 475 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x92, 0xc1, 0x6e, 0xd4, 0x30, + 0x10, 0x86, 0x9b, 0x05, 0x2a, 0x94, 0x22, 0x01, 0x81, 0x42, 0x59, 0x44, 0xd5, 0xf6, 0xb4, 0x02, + 0x61, 0x4b, 0x29, 0x07, 0x38, 0x76, 0x2b, 0x95, 0x1e, 0xa8, 0x5a, 0x2d, 0x12, 0xd7, 0xc8, 0x9b, + 0x4c, 0xb2, 0x46, 0x5e, 0x8f, 0xb1, 0x27, 0xe9, 0xf6, 0xc6, 0x85, 0x33, 0xd7, 0x3e, 0x0b, 0x4f, + 0xc0, 0x95, 0x57, 0xe1, 0x01, 0x10, 0xb2, 0x9d, 0xa8, 0x15, 0x3d, 0x71, 0xdb, 0xf5, 0xef, 0xef, + 0x1f, 0xff, 0x7f, 0x26, 0x7d, 0x0b, 0xba, 0xc3, 0x0b, 0x5e, 0xa2, 0xae, 0x65, 0xc3, 0x6b, 0xa9, + 0x08, 0x2c, 0x5f, 0x10, 0x19, 0xde, 0x58, 0x53, 0x16, 0x8e, 0x04, 0x39, 0xde, 0xe5, 0x42, 0x99, + 0x85, 0xe8, 0x6f, 0x31, 0x63, 0x91, 0x30, 0x7b, 0x15, 0x48, 0xd6, 0x9f, 0x45, 0x92, 0x79, 0x92, + 0x5d, 0x91, 0xac, 0x27, 0xc7, 0x93, 0x38, 0x46, 0x18, 0xc9, 0xbb, 0x9c, 0x97, 0x68, 0x21, 0xfa, + 0x2f, 0x81, 0x16, 0x58, 0x15, 0x4a, 0x3a, 0x8a, 0xb6, 0xe3, 0xed, 0x06, 0xb1, 0x51, 0xc0, 0xc3, + 0xbf, 0x79, 0x5b, 0xf3, 0x73, 0x2b, 0x8c, 0x01, 0xeb, 0x06, 0xbd, 0xad, 0x8c, 0xe0, 0x42, 0x6b, + 0x24, 0x41, 0x12, 0xb5, 0xe3, 0x4b, 0xd9, 0x58, 0x41, 0xd0, 0xeb, 0x2f, 0x6e, 0xe8, 0xfe, 0x25, + 0xed, 0x80, 0x3f, 0xed, 0x84, 0x92, 0x95, 0x20, 0xe0, 0xc3, 0x8f, 0x28, 0xec, 0x5d, 0x8e, 0xd2, + 0x7b, 0x47, 0x21, 0xc4, 0x61, 0x48, 0x94, 0xbd, 0x4c, 0x1f, 0xc2, 0x52, 0x52, 0x11, 0x93, 0x85, + 0x3c, 0xb0, 0x95, 0xec, 0x24, 0x93, 0xbb, 0xb3, 0xfb, 0x5e, 0x88, 0x97, 0x3f, 0xfa, 0xe3, 0x4c, + 0xa7, 0xbb, 0x52, 0x57, 0xb2, 0x93, 0x55, 0x2b, 0xd4, 0x10, 0x2a, 0x34, 0x50, 0x08, 0xa5, 0xf0, + 0xdc, 0xe7, 0xdb, 0x1a, 0xed, 0x24, 0x93, 0x8d, 0x7c, 0x97, 0xc5, 0xde, 0x84, 0x91, 0xac, 0xcb, + 0x99, 0xaf, 0x82, 0xbd, 0xb7, 0xa6, 0x3c, 0x09, 0xd0, 0x07, 0xe9, 0xe8, 0x78, 0x6d, 0xb6, 0x7d, + 0xe5, 0x16, 0xcf, 0xfd, 0x18, 0x77, 0x30, 0x58, 0x65, 0xa7, 0xe9, 0x66, 0x74, 0xaf, 0xd1, 0xfa, + 0x09, 0xfd, 0x48, 0xb7, 0x75, 0x2b, 0xcc, 0x18, 0xb3, 0x58, 0x22, 0x1b, 0x4a, 0x64, 0x53, 0x44, + 0xf5, 0x49, 0xa8, 0x16, 0x8e, 0xd7, 0x66, 0x59, 0x40, 0x8f, 0xd0, 0x1e, 0xa8, 0xde, 0xdd, 0x4d, + 0x9f, 0xa7, 0xcf, 0x0c, 0xd8, 0xeb, 0x2f, 0x2f, 0x9c, 0x81, 0x52, 0xd6, 0x12, 0xec, 0xde, 0x6a, + 0x68, 0xe6, 0x74, 0xfe, 0x19, 0x4a, 0xca, 0xf2, 0x74, 0xd3, 0xc2, 0x97, 0x16, 0x1c, 0x15, 0x4b, + 0x70, 0x4e, 0x34, 0x50, 0x94, 0xd8, 0x6a, 0x0a, 0xed, 0xdc, 0x9e, 0x3d, 0xea, 0xc5, 0x93, 0xa8, + 0x1d, 0x7a, 0x29, 0x7b, 0x93, 0x3e, 0xb1, 0xe0, 0x0c, 0x6a, 0x07, 0xff, 0x40, 0xa3, 0x00, 0x3d, + 0x1e, 0xd4, 0xeb, 0xd4, 0xf4, 0x5b, 0xf2, 0xfb, 0xf2, 0xcf, 0xf7, 0x3b, 0xaf, 0x87, 0x65, 0x83, + 0x15, 0x81, 0x76, 0xfe, 0xab, 0xf6, 0x0b, 0xe7, 0x6e, 0x6e, 0xdc, 0xfe, 0x8f, 0xaf, 0x3f, 0x7f, + 0xad, 0x8f, 0x1e, 0x24, 0xe9, 0x3b, 0x89, 0xb1, 0x6c, 0x63, 0x71, 0x75, 0xc1, 0xfe, 0x63, 0x5f, + 0xa7, 0x1b, 0x71, 0x09, 0xce, 0x7c, 0x7f, 0x67, 0xc9, 0x7c, 0x3d, 0x14, 0xb9, 0xff, 0x37, 0x00, + 0x00, 0xff, 0xff, 0xb2, 0x64, 0xa9, 0x6d, 0x2e, 0x03, 0x00, 0x00, +} diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go new file mode 100644 index 0000000000000..7739b5a9b6ea6 --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha/config.pb.validate.go @@ -0,0 +1,201 @@ +// Code generated by protoc-gen-validate. DO NOT EDIT. +// source: envoy/config/filter/http/grpc_stats/v2alpha/config.proto + +package envoy_config_filter_http_grpc_stats_v2alpha + +import ( + "bytes" + "errors" + "fmt" + "net" + "net/mail" + "net/url" + "regexp" + "strings" + "time" + "unicode/utf8" + + "github.com/golang/protobuf/ptypes" +) + +// ensure the imports are used +var ( + _ = bytes.MinRead + _ = errors.New("") + _ = fmt.Print + _ = utf8.UTFMax + _ = (*regexp.Regexp)(nil) + _ = (*strings.Reader)(nil) + _ = net.IPv4len + _ = time.Duration(0) + _ = (*url.URL)(nil) + _ = (*mail.Address)(nil) + _ = ptypes.DynamicAny{} +) + +// define the regex for a UUID once up-front +var _config_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$") + +// Validate checks the field values on FilterConfig with the rules defined in +// the proto definition for this message. If any rules are violated, an error +// is returned. +func (m *FilterConfig) Validate() error { + if m == nil { + return nil + } + + // no validation rules for EmitFilterState + + switch m.PerMethodStatSpecifier.(type) { + + case *FilterConfig_IndividualMethodStatsAllowlist: + + if v, ok := interface{}(m.GetIndividualMethodStatsAllowlist()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterConfigValidationError{ + field: "IndividualMethodStatsAllowlist", + reason: "embedded message failed validation", + cause: err, + } + } + } + + case *FilterConfig_StatsForAllMethods: + + if v, ok := interface{}(m.GetStatsForAllMethods()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterConfigValidationError{ + field: "StatsForAllMethods", + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// FilterConfigValidationError is the validation error returned by +// FilterConfig.Validate if the designated constraints aren't met. +type FilterConfigValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e FilterConfigValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e FilterConfigValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e FilterConfigValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e FilterConfigValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e FilterConfigValidationError) ErrorName() string { return "FilterConfigValidationError" } + +// Error satisfies the builtin error interface +func (e FilterConfigValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sFilterConfig.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = FilterConfigValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = FilterConfigValidationError{} + +// Validate checks the field values on FilterObject with the rules defined in +// the proto definition for this message. If any rules are violated, an error +// is returned. +func (m *FilterObject) Validate() error { + if m == nil { + return nil + } + + // no validation rules for RequestMessageCount + + // no validation rules for ResponseMessageCount + + return nil +} + +// FilterObjectValidationError is the validation error returned by +// FilterObject.Validate if the designated constraints aren't met. +type FilterObjectValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e FilterObjectValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e FilterObjectValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e FilterObjectValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e FilterObjectValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e FilterObjectValidationError) ErrorName() string { return "FilterObjectValidationError" } + +// Error satisfies the builtin error interface +func (e FilterObjectValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sFilterObject.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = FilterObjectValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = FilterObjectValidationError{} diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go new file mode 100644 index 0000000000000..0a4de380f3a13 --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.go @@ -0,0 +1,204 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// source: envoy/extensions/filters/http/grpc_stats/v3/config.proto + +package envoy_extensions_filters_http_grpc_stats_v3 + +import ( + fmt "fmt" + _ "github.com/cncf/udpa/go/udpa/annotations" + v3 "github.com/envoyproxy/go-control-plane/envoy/config/core/v3" + _ "github.com/envoyproxy/protoc-gen-validate/validate" + proto "github.com/golang/protobuf/proto" + wrappers "github.com/golang/protobuf/ptypes/wrappers" + math "math" +) + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package + +type FilterConfig struct { + EmitFilterState bool `protobuf:"varint,1,opt,name=emit_filter_state,json=emitFilterState,proto3" json:"emit_filter_state,omitempty"` + // Types that are valid to be assigned to PerMethodStatSpecifier: + // *FilterConfig_IndividualMethodStatsAllowlist + // *FilterConfig_StatsForAllMethods + PerMethodStatSpecifier isFilterConfig_PerMethodStatSpecifier `protobuf_oneof:"per_method_stat_specifier"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FilterConfig) Reset() { *m = FilterConfig{} } +func (m *FilterConfig) String() string { return proto.CompactTextString(m) } +func (*FilterConfig) ProtoMessage() {} +func (*FilterConfig) Descriptor() ([]byte, []int) { + return fileDescriptor_a99092111d6420a4, []int{0} +} + +func (m *FilterConfig) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FilterConfig.Unmarshal(m, b) +} +func (m *FilterConfig) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FilterConfig.Marshal(b, m, deterministic) +} +func (m *FilterConfig) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilterConfig.Merge(m, src) +} +func (m *FilterConfig) XXX_Size() int { + return xxx_messageInfo_FilterConfig.Size(m) +} +func (m *FilterConfig) XXX_DiscardUnknown() { + xxx_messageInfo_FilterConfig.DiscardUnknown(m) +} + +var xxx_messageInfo_FilterConfig proto.InternalMessageInfo + +func (m *FilterConfig) GetEmitFilterState() bool { + if m != nil { + return m.EmitFilterState + } + return false +} + +type isFilterConfig_PerMethodStatSpecifier interface { + isFilterConfig_PerMethodStatSpecifier() +} + +type FilterConfig_IndividualMethodStatsAllowlist struct { + IndividualMethodStatsAllowlist *v3.GrpcMethodList `protobuf:"bytes,2,opt,name=individual_method_stats_allowlist,json=individualMethodStatsAllowlist,proto3,oneof"` +} + +type FilterConfig_StatsForAllMethods struct { + StatsForAllMethods *wrappers.BoolValue `protobuf:"bytes,3,opt,name=stats_for_all_methods,json=statsForAllMethods,proto3,oneof"` +} + +func (*FilterConfig_IndividualMethodStatsAllowlist) isFilterConfig_PerMethodStatSpecifier() {} + +func (*FilterConfig_StatsForAllMethods) isFilterConfig_PerMethodStatSpecifier() {} + +func (m *FilterConfig) GetPerMethodStatSpecifier() isFilterConfig_PerMethodStatSpecifier { + if m != nil { + return m.PerMethodStatSpecifier + } + return nil +} + +func (m *FilterConfig) GetIndividualMethodStatsAllowlist() *v3.GrpcMethodList { + if x, ok := m.GetPerMethodStatSpecifier().(*FilterConfig_IndividualMethodStatsAllowlist); ok { + return x.IndividualMethodStatsAllowlist + } + return nil +} + +func (m *FilterConfig) GetStatsForAllMethods() *wrappers.BoolValue { + if x, ok := m.GetPerMethodStatSpecifier().(*FilterConfig_StatsForAllMethods); ok { + return x.StatsForAllMethods + } + return nil +} + +// XXX_OneofWrappers is for the internal use of the proto package. +func (*FilterConfig) XXX_OneofWrappers() []interface{} { + return []interface{}{ + (*FilterConfig_IndividualMethodStatsAllowlist)(nil), + (*FilterConfig_StatsForAllMethods)(nil), + } +} + +type FilterObject struct { + RequestMessageCount uint64 `protobuf:"varint,1,opt,name=request_message_count,json=requestMessageCount,proto3" json:"request_message_count,omitempty"` + ResponseMessageCount uint64 `protobuf:"varint,2,opt,name=response_message_count,json=responseMessageCount,proto3" json:"response_message_count,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` +} + +func (m *FilterObject) Reset() { *m = FilterObject{} } +func (m *FilterObject) String() string { return proto.CompactTextString(m) } +func (*FilterObject) ProtoMessage() {} +func (*FilterObject) Descriptor() ([]byte, []int) { + return fileDescriptor_a99092111d6420a4, []int{1} +} + +func (m *FilterObject) XXX_Unmarshal(b []byte) error { + return xxx_messageInfo_FilterObject.Unmarshal(m, b) +} +func (m *FilterObject) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + return xxx_messageInfo_FilterObject.Marshal(b, m, deterministic) +} +func (m *FilterObject) XXX_Merge(src proto.Message) { + xxx_messageInfo_FilterObject.Merge(m, src) +} +func (m *FilterObject) XXX_Size() int { + return xxx_messageInfo_FilterObject.Size(m) +} +func (m *FilterObject) XXX_DiscardUnknown() { + xxx_messageInfo_FilterObject.DiscardUnknown(m) +} + +var xxx_messageInfo_FilterObject proto.InternalMessageInfo + +func (m *FilterObject) GetRequestMessageCount() uint64 { + if m != nil { + return m.RequestMessageCount + } + return 0 +} + +func (m *FilterObject) GetResponseMessageCount() uint64 { + if m != nil { + return m.ResponseMessageCount + } + return 0 +} + +func init() { + proto.RegisterType((*FilterConfig)(nil), "envoy.extensions.filters.http.grpc_stats.v3.FilterConfig") + proto.RegisterType((*FilterObject)(nil), "envoy.extensions.filters.http.grpc_stats.v3.FilterObject") +} + +func init() { + proto.RegisterFile("envoy/extensions/filters/http/grpc_stats/v3/config.proto", fileDescriptor_a99092111d6420a4) +} + +var fileDescriptor_a99092111d6420a4 = []byte{ + // 486 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x53, 0x41, 0x6b, 0xd4, 0x40, + 0x18, 0x6d, 0xa2, 0x14, 0x49, 0x05, 0x35, 0x5a, 0x5d, 0x57, 0x5c, 0xda, 0xe2, 0xa1, 0x28, 0xcc, + 0xc0, 0xae, 0x07, 0xed, 0x45, 0xba, 0x85, 0xda, 0x83, 0xa5, 0x25, 0x82, 0xd7, 0x30, 0x9b, 0x7c, + 0xc9, 0x8e, 0xcc, 0xce, 0x37, 0x9d, 0x99, 0xa4, 0xed, 0xcd, 0xa3, 0xbf, 0xc1, 0x7f, 0xa2, 0x77, + 0xc1, 0xab, 0x77, 0x7f, 0x8c, 0xcc, 0x4c, 0xc2, 0x2e, 0xee, 0x49, 0x7a, 0x4b, 0xe6, 0xcd, 0x7b, + 0xdf, 0x7b, 0xef, 0x4b, 0x92, 0x37, 0x20, 0x5b, 0xbc, 0xa6, 0x70, 0x65, 0x41, 0x1a, 0x8e, 0xd2, + 0xd0, 0x8a, 0x0b, 0x0b, 0xda, 0xd0, 0xb9, 0xb5, 0x8a, 0xd6, 0x5a, 0x15, 0xb9, 0xb1, 0xcc, 0x1a, + 0xda, 0x4e, 0x68, 0x81, 0xb2, 0xe2, 0x35, 0x51, 0x1a, 0x2d, 0xa6, 0xaf, 0x3c, 0x93, 0x2c, 0x99, + 0xa4, 0x63, 0x12, 0xc7, 0x24, 0x4b, 0x26, 0x69, 0x27, 0xc3, 0x70, 0xb9, 0x13, 0xa0, 0x05, 0x6a, + 0x70, 0x7a, 0xfe, 0xce, 0x02, 0xec, 0x1c, 0xcb, 0x5c, 0x70, 0x63, 0x83, 0xf2, 0x70, 0x54, 0x23, + 0xd6, 0x02, 0xa8, 0x7f, 0x9b, 0x35, 0x15, 0xbd, 0xd4, 0x4c, 0x29, 0xa7, 0x1c, 0xf0, 0xe7, 0x4d, + 0xa9, 0x18, 0x65, 0x52, 0xa2, 0x65, 0xd6, 0x7b, 0x76, 0x73, 0x9a, 0x1e, 0xde, 0x5d, 0x83, 0x5b, + 0xd0, 0xce, 0x21, 0x97, 0x9d, 0xf7, 0xe1, 0x93, 0x96, 0x09, 0x5e, 0x32, 0x0b, 0xb4, 0x7f, 0x08, + 0xc0, 0xde, 0x9f, 0x38, 0xb9, 0x7b, 0xec, 0x63, 0x1c, 0x79, 0xab, 0xe9, 0xcb, 0xe4, 0x01, 0x2c, + 0xb8, 0xcd, 0x43, 0x36, 0x1f, 0x08, 0x06, 0xd1, 0x4e, 0xb4, 0x7f, 0x27, 0xbb, 0xe7, 0x80, 0x70, + 0xf9, 0xa3, 0x3b, 0x4e, 0x2f, 0x92, 0x5d, 0x2e, 0x4b, 0xde, 0xf2, 0xb2, 0x61, 0xa2, 0xcf, 0xe5, + 0x2b, 0xc8, 0x99, 0x10, 0x78, 0xe9, 0x22, 0x0e, 0xe2, 0x9d, 0x68, 0x7f, 0x6b, 0xfc, 0x82, 0x84, + 0xf6, 0xba, 0x46, 0x5d, 0x21, 0xa4, 0x9d, 0x90, 0xf7, 0x5a, 0x15, 0xa7, 0x9e, 0xf7, 0x81, 0x1b, + 0x7b, 0xb2, 0x91, 0x8d, 0x96, 0x82, 0xe1, 0xdc, 0x4d, 0x32, 0x87, 0xbd, 0x5a, 0x7a, 0x96, 0x6c, + 0x87, 0x01, 0x15, 0x6a, 0x37, 0xa4, 0x9b, 0x6a, 0x06, 0xb7, 0xfc, 0x98, 0x21, 0x09, 0x55, 0x92, + 0xbe, 0x4a, 0x32, 0x45, 0x14, 0x9f, 0x98, 0x68, 0xe0, 0x64, 0x23, 0x4b, 0x3d, 0xf5, 0x18, 0xf5, + 0xa1, 0xe8, 0xd4, 0xcd, 0xc1, 0xbb, 0x6f, 0x3f, 0xbf, 0x8e, 0x0e, 0xba, 0xcf, 0xa2, 0xb7, 0x17, + 0xc2, 0xaf, 0xef, 0x75, 0xcc, 0x84, 0x9a, 0x33, 0xb2, 0x5a, 0xd8, 0xf4, 0x59, 0xf2, 0x54, 0x81, + 0x5e, 0x4d, 0x9f, 0x1b, 0x05, 0x05, 0xaf, 0x38, 0xe8, 0xbd, 0xef, 0x51, 0x5f, 0xef, 0xd9, 0xec, + 0x33, 0x14, 0x36, 0x1d, 0x27, 0xdb, 0x1a, 0x2e, 0x1a, 0x30, 0x36, 0x5f, 0x80, 0x31, 0xac, 0x86, + 0xbc, 0xc0, 0x46, 0x5a, 0x5f, 0xf1, 0xed, 0xec, 0x61, 0x07, 0x9e, 0x06, 0xec, 0xc8, 0x41, 0xe9, + 0xeb, 0xe4, 0xb1, 0x06, 0xa3, 0x50, 0x1a, 0xf8, 0x87, 0x14, 0x7b, 0xd2, 0xa3, 0x1e, 0x5d, 0x65, + 0xdd, 0x20, 0x58, 0xb0, 0x3a, 0xcd, 0x7e, 0x7c, 0xf9, 0xf5, 0x7b, 0x33, 0xbe, 0x1f, 0x27, 0x6f, + 0x39, 0x86, 0xf5, 0x29, 0x8d, 0x57, 0xd7, 0xe4, 0x3f, 0xfe, 0x83, 0xe9, 0x56, 0x68, 0xe9, 0xdc, + 0xad, 0xe3, 0x3c, 0x9a, 0x6d, 0xfa, 0xbd, 0x4c, 0xfe, 0x06, 0x00, 0x00, 0xff, 0xff, 0x42, 0xc4, + 0xd3, 0x14, 0x86, 0x03, 0x00, 0x00, +} diff --git a/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go new file mode 100644 index 0000000000000..528244745ed3b --- /dev/null +++ b/vendor/github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3/config.pb.validate.go @@ -0,0 +1,201 @@ +// Code generated by protoc-gen-validate. DO NOT EDIT. +// source: envoy/extensions/filters/http/grpc_stats/v3/config.proto + +package envoy_extensions_filters_http_grpc_stats_v3 + +import ( + "bytes" + "errors" + "fmt" + "net" + "net/mail" + "net/url" + "regexp" + "strings" + "time" + "unicode/utf8" + + "github.com/golang/protobuf/ptypes" +) + +// ensure the imports are used +var ( + _ = bytes.MinRead + _ = errors.New("") + _ = fmt.Print + _ = utf8.UTFMax + _ = (*regexp.Regexp)(nil) + _ = (*strings.Reader)(nil) + _ = net.IPv4len + _ = time.Duration(0) + _ = (*url.URL)(nil) + _ = (*mail.Address)(nil) + _ = ptypes.DynamicAny{} +) + +// define the regex for a UUID once up-front +var _config_uuidPattern = regexp.MustCompile("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$") + +// Validate checks the field values on FilterConfig with the rules defined in +// the proto definition for this message. If any rules are violated, an error +// is returned. +func (m *FilterConfig) Validate() error { + if m == nil { + return nil + } + + // no validation rules for EmitFilterState + + switch m.PerMethodStatSpecifier.(type) { + + case *FilterConfig_IndividualMethodStatsAllowlist: + + if v, ok := interface{}(m.GetIndividualMethodStatsAllowlist()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterConfigValidationError{ + field: "IndividualMethodStatsAllowlist", + reason: "embedded message failed validation", + cause: err, + } + } + } + + case *FilterConfig_StatsForAllMethods: + + if v, ok := interface{}(m.GetStatsForAllMethods()).(interface{ Validate() error }); ok { + if err := v.Validate(); err != nil { + return FilterConfigValidationError{ + field: "StatsForAllMethods", + reason: "embedded message failed validation", + cause: err, + } + } + } + + } + + return nil +} + +// FilterConfigValidationError is the validation error returned by +// FilterConfig.Validate if the designated constraints aren't met. +type FilterConfigValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e FilterConfigValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e FilterConfigValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e FilterConfigValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e FilterConfigValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e FilterConfigValidationError) ErrorName() string { return "FilterConfigValidationError" } + +// Error satisfies the builtin error interface +func (e FilterConfigValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sFilterConfig.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = FilterConfigValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = FilterConfigValidationError{} + +// Validate checks the field values on FilterObject with the rules defined in +// the proto definition for this message. If any rules are violated, an error +// is returned. +func (m *FilterObject) Validate() error { + if m == nil { + return nil + } + + // no validation rules for RequestMessageCount + + // no validation rules for ResponseMessageCount + + return nil +} + +// FilterObjectValidationError is the validation error returned by +// FilterObject.Validate if the designated constraints aren't met. +type FilterObjectValidationError struct { + field string + reason string + cause error + key bool +} + +// Field function returns field value. +func (e FilterObjectValidationError) Field() string { return e.field } + +// Reason function returns reason value. +func (e FilterObjectValidationError) Reason() string { return e.reason } + +// Cause function returns cause value. +func (e FilterObjectValidationError) Cause() error { return e.cause } + +// Key function returns key value. +func (e FilterObjectValidationError) Key() bool { return e.key } + +// ErrorName returns error name. +func (e FilterObjectValidationError) ErrorName() string { return "FilterObjectValidationError" } + +// Error satisfies the builtin error interface +func (e FilterObjectValidationError) Error() string { + cause := "" + if e.cause != nil { + cause = fmt.Sprintf(" | caused by: %v", e.cause) + } + + key := "" + if e.key { + key = "key for " + } + + return fmt.Sprintf( + "invalid %sFilterObject.%s: %s%s", + key, + e.field, + e.reason, + cause) +} + +var _ error = FilterObjectValidationError{} + +var _ interface { + Field() string + Reason() string + Key() bool + Cause() error + ErrorName() string +} = FilterObjectValidationError{} diff --git a/vendor/modules.txt b/vendor/modules.txt index 6b6947fb0f5d0..27783bf5ec2f2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -130,6 +130,7 @@ github.com/envoyproxy/go-control-plane/envoy/config/cluster/v3 github.com/envoyproxy/go-control-plane/envoy/config/core/v3 github.com/envoyproxy/go-control-plane/envoy/config/endpoint/v3 github.com/envoyproxy/go-control-plane/envoy/config/filter/accesslog/v2 +github.com/envoyproxy/go-control-plane/envoy/config/filter/http/grpc_stats/v2alpha github.com/envoyproxy/go-control-plane/envoy/config/filter/http/rbac/v2 github.com/envoyproxy/go-control-plane/envoy/config/filter/listener/tls_inspector/v2 github.com/envoyproxy/go-control-plane/envoy/config/filter/network/http_connection_manager/v2 @@ -145,6 +146,7 @@ github.com/envoyproxy/go-control-plane/envoy/config/rbac/v3 github.com/envoyproxy/go-control-plane/envoy/config/route/v3 github.com/envoyproxy/go-control-plane/envoy/config/trace/v2 github.com/envoyproxy/go-control-plane/envoy/config/trace/v3 +github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/grpc_stats/v3 github.com/envoyproxy/go-control-plane/envoy/extensions/filters/http/rbac/v3 github.com/envoyproxy/go-control-plane/envoy/extensions/filters/listener/tls_inspector/v3 github.com/envoyproxy/go-control-plane/envoy/extensions/filters/network/http_connection_manager/v3 diff --git a/website/content/commands/connect/envoy.mdx b/website/content/commands/connect/envoy.mdx index 9492dbc683487..5adbabdb86c1e 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 cc54138c4dc46..4202063ab7f5a 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -34,10 +34,10 @@ 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.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0\* | +| 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.8‡ | +| 1.8.x | 1.14.7, 1.13.8, 1.12.7, 1.11.2 | +| 1.7.x | 1.13.8, 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† | | 1.4.x, 1.3.x | 1.9.1, 1.8.0†, 1.7.0† |