diff --git a/.changelog/12777.txt b/.changelog/12777.txt new file mode 100644 index 000000000..09c9f7c31 --- /dev/null +++ b/.changelog/12777.txt @@ -0,0 +1,3 @@ +```release-note:improvement +connect: Add Envoy 1.21.1 to support matrix, remove 1.17.4 +``` diff --git a/.circleci/config.yml b/.circleci/config.yml index bbd7671b1..f5b25f359 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -845,13 +845,13 @@ jobs: command: make test-coverage-ci - run: *notify-slack-failure - envoy-integration-test-1_17_4: &ENVOY_TESTS + envoy-integration-test-1_18_6: &ENVOY_TESTS machine: image: ubuntu-2004:202101-01 parallelism: 4 resource_class: medium environment: - ENVOY_VERSION: "1.17.4" + ENVOY_VERSION: "1.18.6" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -884,11 +884,6 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1_18_6: - <<: *ENVOY_TESTS - environment: - ENVOY_VERSION: "1.18.6" - envoy-integration-test-1_19_3: <<: *ENVOY_TESTS environment: @@ -899,6 +894,11 @@ jobs: environment: ENVOY_VERSION: "1.20.2" + envoy-integration-test-1_21_1: + <<: *ENVOY_TESTS + environment: + ENVOY_VERSION: "1.21.1" + # run integration tests for the connect ca providers test-connect-ca-providers: docker: @@ -1140,9 +1140,6 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1_17_4: - requires: - - dev-build - envoy-integration-test-1_18_6: requires: - dev-build @@ -1152,6 +1149,9 @@ workflows: - envoy-integration-test-1_20_2: requires: - dev-build + - envoy-integration-test-1_21_1: + requires: + - dev-build website: unless: << pipeline.parameters.trigger-load-test >> diff --git a/agent/xds/envoy_versioning.go b/agent/xds/envoy_versioning.go index be0a770fe..1ee579890 100644 --- a/agent/xds/envoy_versioning.go +++ b/agent/xds/envoy_versioning.go @@ -11,7 +11,7 @@ import ( var ( // minSupportedVersion is the oldest mainline version we support. This should always be // the zero'th point release of the last element of proxysupport.EnvoyVersions. - minSupportedVersion = version.Must(version.NewVersion("1.17.0")) + minSupportedVersion = version.Must(version.NewVersion("1.18.0")) minVersionToForceLDSandCDSToAlwaysUseWildcardsOnReconnect = version.Must(version.NewVersion("1.19.0")) diff --git a/agent/xds/envoy_versioning_test.go b/agent/xds/envoy_versioning_test.go index fa1565285..c11bcf76a 100644 --- a/agent/xds/envoy_versioning_test.go +++ b/agent/xds/envoy_versioning_test.go @@ -123,7 +123,6 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { // Insert a bunch of valid versions. // Populate feature flags here when appropriate. See consul 1.10.x for reference. for _, v := range []string{ - "1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4", "1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4", "1.18.5", "1.18.6", } { cases[v] = testcase{expect: supportedProxyFeatures{ @@ -133,6 +132,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) { for _, v := range []string{ "1.19.0", "1.19.1", "1.19.2", "1.19.3", "1.20.0", "1.20.1", "1.20.2", + "1.21.1", } { cases[v] = testcase{expect: supportedProxyFeatures{}} } diff --git a/agent/xds/golden_test.go b/agent/xds/golden_test.go index 78baf8baa..0efcc155b 100644 --- a/agent/xds/golden_test.go +++ b/agent/xds/golden_test.go @@ -35,7 +35,11 @@ func goldenEnvoy(t *testing.T, name, envoyVersion, latestEnvoyVersion, got strin // coalescing works below when there is no xDS generated skew across envoy // versions. subname := goldenEnvoyVersionName(t, envoyVersion) - latestSubname := goldenEnvoyVersionName(t, latestEnvoyVersion) + + latestSubname := "latest" + if envoyVersion == latestEnvoyVersion { + subname = "latest" + } return golden(t, name, subname, latestSubname, got) } @@ -85,7 +89,7 @@ func golden(t *testing.T, name, subname, latestSubname, got string) string { if latestSubname != "" && subname != latestSubname { latestGolden := filepath.Join("testdata", fmt.Sprintf("%s.%s.golden", name, latestSubname)) raw, err := ioutil.ReadFile(latestGolden) - require.NoError(t, err) + require.NoError(t, err, "%q %q %q", name, subname, latestSubname) latestExpected = string(raw) } diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go index aab92fa25..c3a9ba05f 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.21.1", "1.20.2", "1.19.3", "1.18.6", - "1.17.4", } diff --git a/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-lb-in-resolver.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-cipher-suites.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-max-version.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.envoy-1-20-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tls-outgoing-min-version.latest.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.latest.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.latest.golden diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-limits.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-limits.latest.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-local-app.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-local-app.latest.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-timeouts.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.latest.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.latest.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-20-x.golden b/agent/xds/testdata/clusters/custom-upstream.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/custom-upstream.latest.golden diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-20-x.golden b/agent/xds/testdata/clusters/defaults.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/defaults.latest.golden diff --git a/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-20-x.golden b/agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/downstream-service-with-unix-sockets.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/downstream-service-with-unix-sockets.latest.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.latest.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-20-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.latest.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-cipher-suites.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-max-version.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-with-tls-outgoing-min-version.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-lb-in-resolver.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-lb-in-resolver.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-hash-lb-ignored.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-non-hash-lb-injected.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.latest.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/mesh-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-lb-config.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-lb-config.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-sni.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-sni.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-sni.latest.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/clusters/terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.latest.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden b/agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/transparent-proxy-catalog-destinations-only.latest.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden b/agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/transparent-proxy-dial-instances-directly.latest.golden diff --git a/agent/xds/testdata/clusters/transparent-proxy.envoy-1-20-x.golden b/agent/xds/testdata/clusters/transparent-proxy.latest.golden similarity index 100% rename from agent/xds/testdata/clusters/transparent-proxy.envoy-1-20-x.golden rename to agent/xds/testdata/clusters/transparent-proxy.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/defaults.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/defaults.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.latest.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-newer-information-in-federation-states.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-older-information-in-federation-states.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.latest.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.latest.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.latest.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.latest.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-upstream-defaults.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-upstream-defaults.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-cipher-suites.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-max-version.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tls-incoming-min-version.latest.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.envoy-1-20-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tls-outgoing-min-version-auto.latest.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-2.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-2.latest.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http-missing.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http-missing.latest.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-public-listener-http.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener-http.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-public-listener-http.latest.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-public-listener.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.latest.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-upstream-ignored-with-disco-chain.latest.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-20-x.golden b/agent/xds/testdata/listeners/custom-upstream.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/custom-upstream.latest.golden diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-20-x.golden b/agent/xds/testdata/listeners/defaults.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/defaults.latest.golden diff --git a/agent/xds/testdata/listeners/expose-checks.envoy-1-20-x.golden b/agent/xds/testdata/listeners/expose-checks.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-checks.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/expose-checks.latest.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-20-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.latest.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-20-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.latest.golden diff --git a/agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-20-x.golden b/agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/http-listener-with-timeouts.latest.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-20-x.golden b/agent/xds/testdata/listeners/http-public-listener.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/http-public-listener.latest.golden diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-20-x.golden b/agent/xds/testdata/listeners/http-upstream.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/http-upstream.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener+service-level.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-http.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level-mixed-tls.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-gw-level.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-listener-listener-level.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-service-level-mixed-no-tls.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-sds-service-level.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-sds-service-level.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-single-tls-listener.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-single-tls-listener.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-single-tls-listener.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener-cipher-suites.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener-max-version.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener-min-version.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-min-version-listeners-gateway-defaults.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-mixed-listeners.latest.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.envoy-1-20-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-mixed-min-version-listeners.latest.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-20-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.latest.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-20-x.golden b/agent/xds/testdata/listeners/listener-bind-address.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.latest.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-20-x.golden b/agent/xds/testdata/listeners/listener-bind-port.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.latest.golden diff --git a/agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-20-x.golden b/agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-unix-domain-socket.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/listener-unix-domain-socket.latest.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-20-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.latest.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-20-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.latest.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-20-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.latest.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/mesh-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-cipher-suites.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-max-version.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-with-tls-incoming-min-version.latest.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden b/agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-catalog-destinations-only.latest.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden b/agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-dial-instances-directly.latest.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-http-upstream.envoy-1-20-x.golden b/agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-http-upstream.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-http-upstream.latest.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/transparent-proxy-terminating-gateway.latest.golden diff --git a/agent/xds/testdata/listeners/transparent-proxy.envoy-1-20-x.golden b/agent/xds/testdata/listeners/transparent-proxy.latest.golden similarity index 100% rename from agent/xds/testdata/listeners/transparent-proxy.envoy-1-20-x.golden rename to agent/xds/testdata/listeners/transparent-proxy.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-lb-in-resolver.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-lb-in-resolver.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.latest.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-20-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-20-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.latest.golden diff --git a/agent/xds/testdata/routes/defaults.envoy-1-20-x.golden b/agent/xds/testdata/routes/defaults.latest.golden similarity index 100% rename from agent/xds/testdata/routes/defaults.envoy-1-20-x.golden rename to agent/xds/testdata/routes/defaults.latest.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.latest.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.latest.golden diff --git a/agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-lb-in-resolver.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-lb-in-resolver.latest.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router-header-manip.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-chain.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-listener-level-wildcard.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-listener-level.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-listener-level.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-service-level-mixed-tls.latest.golden diff --git a/agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-20-x.golden b/agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-sds-service-level.envoy-1-20-x.golden rename to agent/xds/testdata/routes/ingress-with-sds-service-level.latest.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-20-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-20-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.latest.golden diff --git a/agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-20-x.golden b/agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden similarity index 100% rename from agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-20-x.golden rename to agent/xds/testdata/routes/terminating-gateway-lb-config.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway-with-service-resolvers.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/clusters/lambda-terminating-gateway.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway-with-service-resolvers.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/listeners/lambda-terminating-gateway.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway-with-service-resolvers.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway-with-service-resolvers.latest.golden diff --git a/agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway.envoy-1-20-x.golden b/agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway.latest.golden similarity index 100% rename from agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway.envoy-1-20-x.golden rename to agent/xds/testdata/serverless_plugin/routes/lambda-terminating-gateway.latest.golden diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index bd33af513..67127c89f 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services" DEBUG=${DEBUG:-} # ENVOY_VERSION to run each test against -ENVOY_VERSION=${ENVOY_VERSION:-"1.20.2"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.21.1"} export ENVOY_VERSION export DOCKER_BUILDKIT=1 diff --git a/website/content/docs/connect/proxies/envoy.mdx b/website/content/docs/connect/proxies/envoy.mdx index 516618877..35d21fad2 100644 --- a/website/content/docs/connect/proxies/envoy.mdx +++ b/website/content/docs/connect/proxies/envoy.mdx @@ -30,12 +30,13 @@ Envoy must be run with the `--max-obj-name-len` option set to `256` or greater f ## Supported Versions -The following matrix describes Envoy compatibility for the currently supported **n-2 major Consul releases**. For previous Consul version compatability please view the respective versioned docs for this page. +The following matrix describes Envoy compatibility for the currently supported **n-2 major Consul releases**. For previous Consul version compatability please view the respective versioned docs for this page. Consul supports **four major Envoy releases** at the beginning of each major Consul release. Consul maintains compatibility with Envoy patch releases for each major version so that users can benefit from bug and security fixes in Envoy. As a policy, Consul will add support for a new major versions of Envoy in a Consul major release. Support for newer versions of Envoy will not be added to existing releases. | Consul Version | Compatible Envoy Versions | | ------------------- | -----------------------------------------------------------------------------------| +| 1.12.x | 1.21.1, 1.20.2, 1.19.3, 1.18.6 | | 1.11.x | 1.20.2, 1.19.3, 1.18.6, 1.17.41 | | 1.10.x | 1.18.6, 1.17.41, 1.16.51 , 1.15.51 | | 1.9.x | 1.16.51, 1.15.51, 1.14.71,2, 1.13.71,2 |