From 461063f8fd906ef1f8a40b96826a16c90bbe1638 Mon Sep 17 00:00:00 2001
From: "R.B. Boyer" <rb@hashicorp.com>
Date: Tue, 13 Oct 2020 15:51:05 -0500
Subject: [PATCH] connect: add support for envoy 1.16.0, drop support for
 1.12.x, and bump point releases as well

---
 .circleci/config.yml                          | 24 +++++++++----------
 agent/xds/envoy_versioning.go                 | 17 +------------
 agent/xds/envoy_versioning_test.go            | 15 +++++++-----
 agent/xds/proxysupport/proxysupport.go        |  8 +++----
 ...-proxy-lb-in-resolver.envoy-1-16-x.golden} |  0
 ...th-chain-and-failover.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...nect-proxy-with-chain.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...-max-connections-only.envoy-1-16-x.golden} |  0
 ...om-limits-set-to-zero.envoy-1-16-x.golden} |  0
 ...lden => custom-limits.envoy-1-16-x.golden} |  0
 ...n => custom-local-app.envoy-1-16-x.golden} |  0
 ...en => custom-timeouts.envoy-1-16-x.golden} |  0
 ...pstream-default-chain.envoy-1-16-x.golden} |  0
 ...en => custom-upstream.envoy-1-16-x.golden} |  0
 ...-x.golden => defaults.envoy-1-16-x.golden} |  0
 ...rpc-new-cluster-http1.envoy-1-16-x.golden} |  0
 ...paths-local-app-paths.envoy-1-16-x.golden} |  0
 ...ths-new-cluster-http2.envoy-1-16-x.golden} |  0
 ...s-gateway-no-services.envoy-1-16-x.golden} |  0
 ...en => ingress-gateway.envoy-1-16-x.golden} |  0
 ...ngress-lb-in-resolver.envoy-1-16-x.golden} |  0
 ...ers-duplicate-service.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...th-chain-and-failover.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...=> ingress-with-chain.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...teway-hash-lb-ignored.envoy-1-16-x.golden} |  0
 ...gnore-extra-resolvers.envoy-1-16-x.golden} |  0
 ...h-gateway-no-services.envoy-1-16-x.golden} |  0
 ...-non-hash-lb-injected.envoy-1-16-x.golden} |  0
 ...teway-service-subsets.envoy-1-16-x.golden} |  0
 ...eway-service-timeouts.envoy-1-16-x.golden} |  0
 ...ing-federation-states.envoy-1-16-x.golden} |  0
 ...olden => mesh-gateway.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...tname-service-subsets.envoy-1-16-x.golden} |  0
 ...gnore-extra-resolvers.envoy-1-16-x.golden} |  0
 ...ing-gateway-lb-config.envoy-1-16-x.golden} |  0
 ...g-gateway-no-services.envoy-1-16-x.golden} |  0
 ...teway-service-subsets.envoy-1-16-x.golden} |  0
 ...> terminating-gateway.envoy-1-16-x.golden} |  0
 ...th-chain-and-failover.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...nect-proxy-with-chain.envoy-1-16-x.golden} |  0
 ...in-and-custom-cluster.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...-x.golden => defaults.envoy-1-16-x.golden} |  0
 ...s-gateway-no-services.envoy-1-16-x.golden} |  0
 ...en => ingress-gateway.envoy-1-16-x.golden} |  0
 ...ers-duplicate-service.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...th-chain-and-failover.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...=> ingress-with-chain.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...cal-gateway-triggered.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...ote-gateway-triggered.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...efault-service-subset.envoy-1-16-x.golden} |  0
 ...h-gateway-no-services.envoy-1-16-x.golden} |  0
 ...teway-service-subsets.envoy-1-16-x.golden} |  0
 ...ing-federation-states.envoy-1-16-x.golden} |  0
 ...olden => mesh-gateway.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...efault-service-subset.envoy-1-16-x.golden} |  0
 ...g-gateway-no-services.envoy-1-16-x.golden} |  0
 ...teway-service-subsets.envoy-1-16-x.golden} |  0
 ...> terminating-gateway.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...proxy-with-grpc-chain.envoy-1-16-x.golden} |  0
 ...proxy-with-http-chain.envoy-1-16-x.golden} |  0
 ...roxy-with-http2-chain.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...-proxy-with-tcp-chain.envoy-1-16-x.golden} |  0
 ...listener-http-2-typed.envoy-1-16-x.golden} |  0
 ...ublic-listener-http-2.envoy-1-16-x.golden} |  0
 ...listener-http-missing.envoy-1-16-x.golden} |  0
 ...c-listener-http-typed.envoy-1-16-x.golden} |  0
 ...-public-listener-http.envoy-1-16-x.golden} |  0
 ...ustom-public-listener.envoy-1-16-x.golden} |  0
 ...ored-with-disco-chain.envoy-1-16-x.golden} |  0
 ...en => custom-upstream.envoy-1-16-x.golden} |  0
 ...-x.golden => defaults.envoy-1-16-x.golden} |  0
 ...paths-local-app-paths.envoy-1-16-x.golden} |  0
 ...ths-new-cluster-http2.envoy-1-16-x.golden} |  0
 ... http-public-listener.envoy-1-16-x.golden} |  0
 ...lden => http-upstream.envoy-1-16-x.golden} |  0
 ...ss-gateway-bind-addrs.envoy-1-16-x.golden} |  0
 ...s-gateway-no-services.envoy-1-16-x.golden} |  0
 ...en => ingress-gateway.envoy-1-16-x.golden} |  0
 ...ttp-multiple-services.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...through-local-gateway.envoy-1-16-x.golden} |  0
 ...hrough-remote-gateway.envoy-1-16-x.golden} |  0
 ...ess-with-tls-listener.envoy-1-16-x.golden} |  0
 ...ner-bind-address-port.envoy-1-16-x.golden} |  0
 ...listener-bind-address.envoy-1-16-x.golden} |  0
 ...=> listener-bind-port.envoy-1-16-x.golden} |  0
 ...eway-custom-addresses.envoy-1-16-x.golden} |  0
 ...h-gateway-no-services.envoy-1-16-x.golden} |  0
 ...eway-tagged-addresses.envoy-1-16-x.golden} |  0
 ...ing-federation-states.envoy-1-16-x.golden} |  0
 ...olden => mesh-gateway.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...-and-tagged-addresses.envoy-1-16-x.golden} |  0
 ...g-gateway-no-api-cert.envoy-1-16-x.golden} |  0
 ...g-gateway-no-services.envoy-1-16-x.golden} |  0
 ...teway-service-subsets.envoy-1-16-x.golden} |  0
 ...> terminating-gateway.envoy-1-16-x.golden} |  0
 ...-proxy-lb-in-resolver.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...with-chain-and-router.envoy-1-16-x.golden} |  0
 ...th-chain-and-splitter.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...nect-proxy-with-chain.envoy-1-16-x.golden} |  0
 ...roxy-with-grpc-router.envoy-1-16-x.golden} |  0
 ... => defaults-no-chain.envoy-1-16-x.golden} |  0
 ...ess-defaults-no-chain.envoy-1-16-x.golden} |  0
 ...ttp-multiple-services.envoy-1-16-x.golden} |  0
 ...ngress-lb-in-resolver.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...h-chain-and-overrides.envoy-1-16-x.golden} |  0
 ...with-chain-and-router.envoy-1-16-x.golden} |  0
 ...th-chain-and-splitter.envoy-1-16-x.golden} |  0
 ...th-chain-external-sni.envoy-1-16-x.golden} |  0
 ...=> ingress-with-chain.envoy-1-16-x.golden} |  0
 ...ress-with-grpc-router.envoy-1-16-x.golden} |  0
 ...ith-resolver-redirect.envoy-1-16-x.golden} |  0
 ...ing-gateway-lb-config.envoy-1-16-x.golden} |  0
 ..._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 +-
 .../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 +-
 test/integration/connect/envoy/run-tests.sh   |  2 +-
 .../connect/envoy/test-envoy-versions.sh      |  9 +------
 website/pages/commands/connect/envoy.mdx      |  2 +-
 website/pages/docs/connect/proxies/envoy.mdx  |  2 +-
 191 files changed, 52 insertions(+), 71 deletions(-)
 rename agent/xds/testdata/clusters/{connect-proxy-lb-in-resolver.envoy-1-12-x.golden => connect-proxy-lb-in-resolver.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-failover.envoy-1-12-x.golden => connect-proxy-with-chain-and-failover.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-chain-external-sni.envoy-1-12-x.golden => connect-proxy-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-chain.envoy-1-12-x.golden => connect-proxy-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-limits-max-connections-only.envoy-1-12-x.golden => custom-limits-max-connections-only.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-limits-set-to-zero.envoy-1-12-x.golden => custom-limits-set-to-zero.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-limits.envoy-1-12-x.golden => custom-limits.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-local-app.envoy-1-12-x.golden => custom-local-app.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-timeouts.envoy-1-12-x.golden => custom-timeouts.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-upstream-default-chain.envoy-1-12-x.golden => custom-upstream-default-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{custom-upstream.envoy-1-12-x.golden => custom-upstream.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{defaults.envoy-1-12-x.golden => defaults.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{expose-paths-grpc-new-cluster-http1.envoy-1-12-x.golden => expose-paths-grpc-new-cluster-http1.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{expose-paths-local-app-paths.envoy-1-12-x.golden => expose-paths-local-app-paths.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{expose-paths-new-cluster-http2.envoy-1-12-x.golden => expose-paths-new-cluster-http2.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-gateway-no-services.envoy-1-12-x.golden => ingress-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-gateway.envoy-1-12-x.golden => ingress-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-lb-in-resolver.envoy-1-12-x.golden => ingress-lb-in-resolver.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden => ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-chain-and-failover.envoy-1-12-x.golden => ingress-with-chain-and-failover.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-chain-and-overrides.envoy-1-12-x.golden => ingress-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-chain-external-sni.envoy-1-12-x.golden => ingress-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-chain.envoy-1-12-x.golden => ingress-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-hash-lb-ignored.envoy-1-12-x.golden => mesh-gateway-hash-lb-ignored.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-ignore-extra-resolvers.envoy-1-12-x.golden => mesh-gateway-ignore-extra-resolvers.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-no-services.envoy-1-12-x.golden => mesh-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-non-hash-lb-injected.envoy-1-12-x.golden => mesh-gateway-non-hash-lb-injected.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-service-subsets.envoy-1-12-x.golden => mesh-gateway-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-service-timeouts.envoy-1-12-x.golden => mesh-gateway-service-timeouts.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway-using-federation-states.envoy-1-12-x.golden => mesh-gateway-using-federation-states.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{mesh-gateway.envoy-1-12-x.golden => mesh-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{splitter-with-resolver-redirect.envoy-1-12-x.golden => splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway-hostname-service-subsets.envoy-1-12-x.golden => terminating-gateway-hostname-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway-ignore-extra-resolvers.envoy-1-12-x.golden => terminating-gateway-ignore-extra-resolvers.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway-lb-config.envoy-1-12-x.golden => terminating-gateway-lb-config.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway-no-services.envoy-1-12-x.golden => terminating-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway-service-subsets.envoy-1-12-x.golden => terminating-gateway-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/clusters/{terminating-gateway.envoy-1-12-x.golden => terminating-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-failover.envoy-1-12-x.golden => connect-proxy-with-chain-and-failover.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-chain-external-sni.envoy-1-12-x.golden => connect-proxy-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-chain.envoy-1-12-x.golden => connect-proxy-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-default-chain-and-custom-cluster.envoy-1-12-x.golden => connect-proxy-with-default-chain-and-custom-cluster.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{defaults.envoy-1-12-x.golden => defaults.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-gateway-no-services.envoy-1-12-x.golden => ingress-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-gateway.envoy-1-12-x.golden => ingress-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden => ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-chain-and-failover.envoy-1-12-x.golden => ingress-with-chain-and-failover.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-chain-and-overrides.envoy-1-12-x.golden => ingress-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-chain-external-sni.envoy-1-12-x.golden => ingress-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-chain.envoy-1-12-x.golden => ingress-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{mesh-gateway-default-service-subset.envoy-1-12-x.golden => mesh-gateway-default-service-subset.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{mesh-gateway-no-services.envoy-1-12-x.golden => mesh-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{mesh-gateway-service-subsets.envoy-1-12-x.golden => mesh-gateway-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{mesh-gateway-using-federation-states.envoy-1-12-x.golden => mesh-gateway-using-federation-states.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{mesh-gateway.envoy-1-12-x.golden => mesh-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{splitter-with-resolver-redirect.envoy-1-12-x.golden => splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{terminating-gateway-default-service-subset.envoy-1-12-x.golden => terminating-gateway-default-service-subset.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{terminating-gateway-no-services.envoy-1-12-x.golden => terminating-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{terminating-gateway-service-subsets.envoy-1-12-x.golden => terminating-gateway-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/endpoints/{terminating-gateway.envoy-1-12-x.golden => terminating-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-chain-external-sni.envoy-1-12-x.golden => connect-proxy-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-grpc-chain.envoy-1-12-x.golden => connect-proxy-with-grpc-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-http-chain.envoy-1-12-x.golden => connect-proxy-with-http-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-http2-chain.envoy-1-12-x.golden => connect-proxy-with-http2-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{connect-proxy-with-tcp-chain.envoy-1-12-x.golden => connect-proxy-with-tcp-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener-http-2-typed.envoy-1-12-x.golden => custom-public-listener-http-2-typed.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener-http-2.envoy-1-12-x.golden => custom-public-listener-http-2.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener-http-missing.envoy-1-12-x.golden => custom-public-listener-http-missing.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener-http-typed.envoy-1-12-x.golden => custom-public-listener-http-typed.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener-http.envoy-1-12-x.golden => custom-public-listener-http.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-public-listener.envoy-1-12-x.golden => custom-public-listener.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-upstream-typed-ignored-with-disco-chain.envoy-1-12-x.golden => custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{custom-upstream.envoy-1-12-x.golden => custom-upstream.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{defaults.envoy-1-12-x.golden => defaults.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{expose-paths-local-app-paths.envoy-1-12-x.golden => expose-paths-local-app-paths.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{expose-paths-new-cluster-http2.envoy-1-12-x.golden => expose-paths-new-cluster-http2.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{http-public-listener.envoy-1-12-x.golden => http-public-listener.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{http-upstream.envoy-1-12-x.golden => http-upstream.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-gateway-bind-addrs.envoy-1-12-x.golden => ingress-gateway-bind-addrs.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-gateway-no-services.envoy-1-12-x.golden => ingress-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-gateway.envoy-1-12-x.golden => ingress-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-http-multiple-services.envoy-1-12-x.golden => ingress-http-multiple-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-with-chain-and-overrides.envoy-1-12-x.golden => ingress-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-with-chain-external-sni.envoy-1-12-x.golden => ingress-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden => ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{ingress-with-tls-listener.envoy-1-12-x.golden => ingress-with-tls-listener.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{listener-bind-address-port.envoy-1-12-x.golden => listener-bind-address-port.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{listener-bind-address.envoy-1-12-x.golden => listener-bind-address.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{listener-bind-port.envoy-1-12-x.golden => listener-bind-port.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{mesh-gateway-custom-addresses.envoy-1-12-x.golden => mesh-gateway-custom-addresses.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{mesh-gateway-no-services.envoy-1-12-x.golden => mesh-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{mesh-gateway-tagged-addresses.envoy-1-12-x.golden => mesh-gateway-tagged-addresses.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{mesh-gateway-using-federation-states.envoy-1-12-x.golden => mesh-gateway-using-federation-states.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{mesh-gateway.envoy-1-12-x.golden => mesh-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{splitter-with-resolver-redirect.envoy-1-12-x.golden => splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{terminating-gateway-custom-and-tagged-addresses.envoy-1-12-x.golden => terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{terminating-gateway-no-api-cert.envoy-1-12-x.golden => terminating-gateway-no-api-cert.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{terminating-gateway-no-services.envoy-1-12-x.golden => terminating-gateway-no-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{terminating-gateway-service-subsets.envoy-1-12-x.golden => terminating-gateway-service-subsets.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/listeners/{terminating-gateway.envoy-1-12-x.golden => terminating-gateway.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-lb-in-resolver.envoy-1-12-x.golden => connect-proxy-lb-in-resolver.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden => connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-router.envoy-1-12-x.golden => connect-proxy-with-chain-and-router.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-chain-and-splitter.envoy-1-12-x.golden => connect-proxy-with-chain-and-splitter.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-chain-external-sni.envoy-1-12-x.golden => connect-proxy-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-chain.envoy-1-12-x.golden => connect-proxy-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{connect-proxy-with-grpc-router.envoy-1-12-x.golden => connect-proxy-with-grpc-router.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{defaults-no-chain.envoy-1-12-x.golden => defaults-no-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-defaults-no-chain.envoy-1-12-x.golden => ingress-defaults-no-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-http-multiple-services.envoy-1-12-x.golden => ingress-http-multiple-services.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-lb-in-resolver.envoy-1-12-x.golden => ingress-lb-in-resolver.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden => ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-chain-and-overrides.envoy-1-12-x.golden => ingress-with-chain-and-overrides.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-chain-and-router.envoy-1-12-x.golden => ingress-with-chain-and-router.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-chain-and-splitter.envoy-1-12-x.golden => ingress-with-chain-and-splitter.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-chain-external-sni.envoy-1-12-x.golden => ingress-with-chain-external-sni.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-chain.envoy-1-12-x.golden => ingress-with-chain.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{ingress-with-grpc-router.envoy-1-12-x.golden => ingress-with-grpc-router.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{splitter-with-resolver-redirect.envoy-1-12-x.golden => splitter-with-resolver-redirect.envoy-1-16-x.golden} (100%)
 rename agent/xds/testdata/routes/{terminating-gateway-lb-config.envoy-1-12-x.golden => terminating-gateway-lb-config.envoy-1-16-x.golden} (100%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 6884325d0bc7..a5a60bbb0753 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -739,13 +739,13 @@ jobs:
           command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui
       - run: *notify-slack-failure
 
-  envoy-integration-test-1.12.6:
+  envoy-integration-test-1.13.6:
     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
     environment:
-      ENVOY_VERSION: "1.12.6"
+      ENVOY_VERSION: "1.13.6"
     steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
@@ -774,25 +774,25 @@ jobs:
           path: *TEST_RESULTS_DIR
       - run: *notify-slack-failure
 
-  envoy-integration-test-1.13.4:
+  envoy-integration-test-1.14.5:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.13.4"
+      ENVOY_VERSION: "1.14.5"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.14.4:
+  envoy-integration-test-1.15.2:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.14.4"
+      ENVOY_VERSION: "1.15.2"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
-  envoy-integration-test-1.15.0:
+  envoy-integration-test-1.16.0:
     docker:
       - image: *GOLANG_IMAGE
     environment:
-      ENVOY_VERSION: "1.15.0"
+      ENVOY_VERSION: "1.16.0"
     steps: *ENVOY_INTEGRATION_TEST_STEPS
 
   # run integration tests for the connect ca providers
@@ -929,16 +929,16 @@ workflows:
       - nomad-integration-0_8:
           requires:
             - dev-build
-      - envoy-integration-test-1.12.6:
+      - envoy-integration-test-1.13.6:
           requires:
             - dev-build
-      - envoy-integration-test-1.13.4:
+      - envoy-integration-test-1.14.5:
           requires:
             - dev-build
-      - envoy-integration-test-1.14.4:
+      - envoy-integration-test-1.15.2:
           requires:
             - dev-build
-      - envoy-integration-test-1.15.0:
+      - envoy-integration-test-1.16.0:
           requires:
             - dev-build
   website:
diff --git a/agent/xds/envoy_versioning.go b/agent/xds/envoy_versioning.go
index 14064b1c9ac4..3b035c615de0 100644
--- a/agent/xds/envoy_versioning.go
+++ b/agent/xds/envoy_versioning.go
@@ -11,24 +11,9 @@ 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.12.0"))
+	minSupportedVersion = version.Must(version.NewVersion("1.13.0"))
 
 	specificUnsupportedVersions = []unsupportedVersion{
-		{
-			Version:   version.Must(version.NewVersion("1.12.0")),
-			UpgradeTo: "1.12.3+",
-			Why:       "does not support RBAC rules using url_path",
-		},
-		{
-			Version:   version.Must(version.NewVersion("1.12.1")),
-			UpgradeTo: "1.12.3+",
-			Why:       "does not support RBAC rules using url_path",
-		},
-		{
-			Version:   version.Must(version.NewVersion("1.12.2")),
-			UpgradeTo: "1.12.3+",
-			Why:       "does not support RBAC rules using url_path",
-		},
 		{
 			Version:   version.Must(version.NewVersion("1.13.0")),
 			UpgradeTo: "1.13.1+",
diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go
index e9f8d5308659..54be604d6787 100644
--- a/agent/xds/envoy_versioning_test.go
+++ b/agent/xds/envoy_versioning_test.go
@@ -72,7 +72,6 @@ func TestDetermineEnvoyVersionFromNode(t *testing.T) {
 
 func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	const (
-		err1_12   = "is too old of a point release and is not supported by Consul because it does not support RBAC rules using url_path. Please upgrade to version 1.12.3+."
 		err1_13   = "is too old of a point release and is not supported by Consul because it does not support RBAC rules using url_path. Please upgrade to version 1.13.1+."
 		errTooOld = "is too old and is not supported by Consul"
 	)
@@ -87,18 +86,22 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 		"1.9.0":  {expectErr: "Envoy 1.9.0 " + errTooOld},
 		"1.10.0": {expectErr: "Envoy 1.10.0 " + errTooOld},
 		"1.11.0": {expectErr: "Envoy 1.11.0 " + errTooOld},
-		"1.12.0": {expectErr: "Envoy 1.12.0 " + err1_12},
-		"1.12.1": {expectErr: "Envoy 1.12.1 " + err1_12},
-		"1.12.2": {expectErr: "Envoy 1.12.2 " + err1_12},
+		"1.12.0": {expectErr: "Envoy 1.12.0 " + errTooOld},
+		"1.12.1": {expectErr: "Envoy 1.12.1 " + errTooOld},
+		"1.12.2": {expectErr: "Envoy 1.12.2 " + errTooOld},
+		"1.12.3": {expectErr: "Envoy 1.12.3 " + errTooOld},
+		"1.12.4": {expectErr: "Envoy 1.12.4 " + errTooOld},
+		"1.12.5": {expectErr: "Envoy 1.12.5 " + errTooOld},
+		"1.12.6": {expectErr: "Envoy 1.12.6 " + errTooOld},
+		"1.12.7": {expectErr: "Envoy 1.12.7 " + errTooOld},
 		"1.13.0": {expectErr: "Envoy 1.13.0 " + err1_13},
 	}
 
 	// Insert a bunch of valid versions.
 	for _, v := range []string{
-		"1.12.3", "1.12.4", "1.12.5", "1.12.6", "1.12.7",
 		"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.14.1",
 		"1.14.2", "1.14.3", "1.14.4", "1.14.5",
-		"1.15.0", "1.15.1", "1.15.2",
+		"1.15.0", "1.15.1", "1.15.2", "1.16.0",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}
diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go
index ed4be6048631..24f88f39bd67 100644
--- a/agent/xds/proxysupport/proxysupport.go
+++ b/agent/xds/proxysupport/proxysupport.go
@@ -7,8 +7,8 @@ package proxysupport
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
-	"1.15.0",
-	"1.14.4",
-	"1.13.4",
-	"1.12.6",
+	"1.16.0",
+	"1.15.2",
+	"1.14.5",
+	"1.13.6",
 }
diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-chain.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-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.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.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.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-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.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.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-limits.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-limits.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-12-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-12-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/defaults.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/defaults.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-12-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-12-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-12-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-12-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.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-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.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.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.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-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.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.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/defaults.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/defaults.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-12-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-12-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-2-typed.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http-typed.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-12-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-12-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/defaults.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/defaults.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-12-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-12-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-12-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-12-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/http-upstream.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/http-upstream.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-12-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-12-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-12-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-12-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-12-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-12-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-12-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-12-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-12-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-12-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-12-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-12-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-12-x.golden
rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-12-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-12-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-12-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-12-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-16-x.golden
diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-12-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-16-x.golden
similarity index 100%
rename from agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-12-x.golden
rename to agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-16-x.golden
diff --git a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
index 27ebc5f4543c..a2fdad2549d7 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden
index e20699eb8f64..c8d20d8900a6 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden
index 3866bbd8bc8e..c577836057c0 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden
index f1fce5d7d6c8..761fcc56c836 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/existing-ca-path.golden b/command/connect/envoy/testdata/existing-ca-path.golden
index 1dd467ce4cc5..7aa20576212f 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden
index b8cf3c48550a..0b432401d5e5 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden
index 90e29172cd2d..97b0568c1ec5 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden
index 5e36f1b92d1b..c438f4bf76d8 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden
index 5e36f1b92d1b..c438f4bf76d8 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden
index 5e36f1b92d1b..c438f4bf76d8 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden
index 86b147acac3a..11413cf4ae2e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "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 b020b9e59347..efb6232c3329 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "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 84744703ffe5..de1912ec984e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "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 5bd97f0bbc38..0d1239e903b9 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "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 098363d089fb..93720d2b84fb 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden
index 962dcefe123d..ba56e634f119 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden
index 4453d13b82a1..62a7809c8e7a 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden
index 5e0bf0f893b7..62e3a58f682e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden
index 5e0bf0f893b7..62e3a58f682e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden
index 5e0bf0f893b7..62e3a58f682e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden
index 5e0bf0f893b7..62e3a58f682e 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden
index 1db13556b171..811910f02a7a 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.15.0"
+      "envoy_version": "1.16.0"
     }
   },
   "static_resources": {
diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh
index 09bfb6e89c9e..90f4b845e10e 100755
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@@ -6,7 +6,7 @@ set -eEuo pipefail
 DEBUG=${DEBUG:-}
 
 # ENVOY_VERSION to run each test against
-ENVOY_VERSION=${ENVOY_VERSION:-"1.15.0"}
+ENVOY_VERSION=${ENVOY_VERSION:-"1.16.0"}
 export ENVOY_VERSION
 
 if [ ! -z "$DEBUG" ] ; then
diff --git a/test/integration/connect/envoy/test-envoy-versions.sh b/test/integration/connect/envoy/test-envoy-versions.sh
index 5fabcf2383ef..2fbfcb3bd15d 100755
--- a/test/integration/connect/envoy/test-envoy-versions.sh
+++ b/test/integration/connect/envoy/test-envoy-versions.sh
@@ -7,20 +7,12 @@ unset CDPATH
 cd "$(dirname "$0")"
 
 ## no rbac url_path support
-    # 1.12.0
-    # 1.12.1
-    # 1.12.2
     # 1.13.0
 
 ## does not exist in docker
     # 1.13.5
     # 1.14.0
 versions=(
-    1.12.3
-    1.12.4
-    1.12.5
-    1.12.6
-    1.12.7
     1.13.1
     1.13.2
     1.13.3
@@ -34,6 +26,7 @@ versions=(
     1.15.0
     1.15.1
     1.15.2
+    1.16.0
 )
 
 for v in "${versions[@]}"; do
diff --git a/website/pages/commands/connect/envoy.mdx b/website/pages/commands/connect/envoy.mdx
index 6566a9385f2c..59179610ee4b 100644
--- a/website/pages/commands/connect/envoy.mdx
+++ b/website/pages/commands/connect/envoy.mdx
@@ -75,7 +75,7 @@ proxy configuration needed.
   allowed to access by [Connect intentions](/docs/connect/intentions).
 
 - `-envoy-version` - The version of envoy that is being started. Default is
-  `1.15.0`. This is required so that the correct configuration can be generated.
+  `1.16.0`. 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/pages/docs/connect/proxies/envoy.mdx b/website/pages/docs/connect/proxies/envoy.mdx
index 8ba5ad605b9f..d14e5452a5fc 100644
--- a/website/pages/docs/connect/proxies/envoy.mdx
+++ b/website/pages/docs/connect/proxies/envoy.mdx
@@ -35,7 +35,7 @@ compatible Envoy versions.
 
 | Consul Version      | Compatible Envoy Versions         |
 | ------------------- | --------------------------------- |
-| 1.9.x               | 1.15.0, 1.14.4‡, 1.13.4‡, 1.12.6‡ |
+| 1.9.x               | 1.16.0, 1.15.0, 1.14.4‡, 1.13.4‡  |
 | 1.8.x               | 1.14.4, 1.13.4, 1.12.6, 1.11.2    |
 | 1.7.x               | 1.13.1, 1.12.3, 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†     |