diff --git a/.circleci/config.yml b/.circleci/config.yml index beb5ce7b3..97b7709ab 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -640,13 +640,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.11.2: + envoy-integration-test-1.12.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.11.2" + ENVOY_VERSION: "1.12.6" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -675,13 +675,6 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1.12.6: - docker: - - image: *GOLANG_IMAGE - environment: - ENVOY_VERSION: "1.12.6" - steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.13.4: docker: - image: *GOLANG_IMAGE @@ -696,6 +689,13 @@ jobs: ENVOY_VERSION: "1.14.4" steps: *ENVOY_INTEGRATION_TEST_STEPS + envoy-integration-test-1.15.0: + docker: + - image: *GOLANG_IMAGE + environment: + ENVOY_VERSION: "1.15.0" + steps: *ENVOY_INTEGRATION_TEST_STEPS + # run integration tests for the connect ca providers test-connect-ca-providers: docker: @@ -807,9 +807,6 @@ workflows: - nomad-integration-0_8: requires: - dev-build - - envoy-integration-test-1.11.2: - requires: - - dev-build - envoy-integration-test-1.12.6: requires: - dev-build @@ -819,6 +816,9 @@ workflows: - envoy-integration-test-1.14.4: requires: - dev-build + - envoy-integration-test-1.15.0: + requires: + - dev-build website: jobs: diff --git a/agent/xds/clusters_test.go b/agent/xds/clusters_test.go index 63accb893..856ab6745 100644 --- a/agent/xds/clusters_test.go +++ b/agent/xds/clusters_test.go @@ -11,6 +11,7 @@ import ( envoy "github.com/envoyproxy/go-control-plane/envoy/api/v2" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" + "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/sdk/testutil" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" @@ -527,8 +528,9 @@ func TestClustersFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range supportedEnvoyVersions { - sf := determineSupportedProxyFeaturesFromString(envoyVersion) + for _, envoyVersion := range proxysupport.EnvoyVersions { + sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) + require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -737,13 +739,3 @@ func setupTLSRootsAndLeaf(t *testing.T, snap *proxycfg.ConfigSnapshot) { snap.Roots.Roots[0].RootCert = golden(t, "test-root-cert", "", "") } } - -// supportedEnvoyVersions lists the versions that we generated golden tests for -// -// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions -var supportedEnvoyVersions = []string{ - "1.14.4", - "1.13.4", - "1.12.6", - "1.11.2", -} diff --git a/agent/xds/endpoints_test.go b/agent/xds/endpoints_test.go index 557bd054e..8d7b5db42 100644 --- a/agent/xds/endpoints_test.go +++ b/agent/xds/endpoints_test.go @@ -14,6 +14,7 @@ import ( envoyendpoint "github.com/envoyproxy/go-control-plane/envoy/api/v2/endpoint" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" + "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/sdk/testutil" testinf "github.com/mitchellh/go-testing-interface" ) @@ -554,8 +555,9 @@ func Test_endpointsFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range supportedEnvoyVersions { - sf := determineSupportedProxyFeaturesFromString(envoyVersion) + for _, envoyVersion := range proxysupport.EnvoyVersions { + sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) + require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/agent/xds/envoy_versioning.go b/agent/xds/envoy_versioning.go index 9e3d0d37a..1ed297f4d 100644 --- a/agent/xds/envoy_versioning.go +++ b/agent/xds/envoy_versioning.go @@ -9,25 +9,37 @@ import ( ) var ( - // minSafeRegexVersion reflects the minimum version where we could use safe_regex instead of regex - // - // NOTE: the first version that no longer supported the old style was 1.13.0 - minSafeRegexVersion = version.Must(version.NewVersion("1.11.2")) + // 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")) ) type supportedProxyFeatures struct { - RouterMatchSafeRegex bool // use safe_regex instead of regex in http.router rules + // add version dependent feature flags here } -func determineSupportedProxyFeatures(node *envoycore.Node) supportedProxyFeatures { +func determineSupportedProxyFeatures(node *envoycore.Node) (supportedProxyFeatures, error) { version := determineEnvoyVersionFromNode(node) + return determineSupportedProxyFeaturesFromVersion(version) +} + +func determineSupportedProxyFeaturesFromString(vs string) (supportedProxyFeatures, error) { + version := version.Must(version.NewVersion(vs)) + return determineSupportedProxyFeaturesFromVersion(version) +} + +func determineSupportedProxyFeaturesFromVersion(version *version.Version) (supportedProxyFeatures, error) { if version == nil { - return supportedProxyFeatures{} + // This would happen on either extremely old builds OR perhaps on + // custom builds. Should we error? + return supportedProxyFeatures{}, nil } - return supportedProxyFeatures{ - RouterMatchSafeRegex: !version.LessThan(minSafeRegexVersion), + if version.LessThan(minSupportedVersion) { + return supportedProxyFeatures{}, fmt.Errorf("Envoy %s is too old and is not supported by Consul", version) } + + return supportedProxyFeatures{}, nil } // example: 1580db37e9a97c37e410bad0e1507ae1a0fd9e77/1.12.4/Clean/RELEASE/BoringSSL @@ -74,10 +86,3 @@ func determineEnvoyVersionFromNode(node *envoycore.Node) *version.Version { ), )) } - -func determineSupportedProxyFeaturesFromString(vs string) supportedProxyFeatures { - version := version.Must(version.NewVersion(vs)) - return supportedProxyFeatures{ - RouterMatchSafeRegex: !version.LessThan(minSafeRegexVersion), - } -} diff --git a/agent/xds/listeners_test.go b/agent/xds/listeners_test.go index 2be7df9e9..77fed27eb 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_test.go @@ -11,6 +11,7 @@ import ( envoy "github.com/envoyproxy/go-control-plane/envoy/api/v2" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" + "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/sdk/testutil" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" @@ -433,8 +434,9 @@ func TestListenersFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range supportedEnvoyVersions { - sf := determineSupportedProxyFeaturesFromString(envoyVersion) + for _, envoyVersion := range proxysupport.EnvoyVersions { + sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) + require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/agent/xds/proxysupport/proxysupport.go b/agent/xds/proxysupport/proxysupport.go new file mode 100644 index 000000000..98296309c --- /dev/null +++ b/agent/xds/proxysupport/proxysupport.go @@ -0,0 +1,11 @@ +package proxysupport + +// EnvoyVersions lists the latest officially supported versions of envoy. +// +// 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", +} diff --git a/agent/xds/routes.go b/agent/xds/routes.go index 2929eb874..e16620ae8 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -277,7 +277,7 @@ func makeUpstreamRouteForDiscoveryChain( return host, nil } -func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *structs.DiscoveryRoute) *envoyroute.RouteMatch { +func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.DiscoveryRoute) *envoyroute.RouteMatch { match := discoveryRoute.Definition.Match if match == nil || match.IsEmpty() { return makeDefaultRouteMatch() @@ -295,14 +295,8 @@ func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *struc Prefix: match.HTTP.PathPrefix, } case match.HTTP.PathRegex != "": - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - em.PathSpecifier = &envoyroute.RouteMatch_SafeRegex{ - SafeRegex: makeEnvoyRegexMatch(match.HTTP.PathRegex), - } - } else { - em.PathSpecifier = &envoyroute.RouteMatch_Regex{ - Regex: match.HTTP.PathRegex, - } + em.PathSpecifier = &envoyroute.RouteMatch_SafeRegex{ + SafeRegex: makeEnvoyRegexMatch(match.HTTP.PathRegex), } default: em.PathSpecifier = &envoyroute.RouteMatch_Prefix{ @@ -323,14 +317,8 @@ func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *struc ExactMatch: hdr.Exact, } case hdr.Regex != "": - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex), - } - } else { - eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_RegexMatch{ - RegexMatch: hdr.Regex, - } + eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ + SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex), } case hdr.Prefix != "": eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_PrefixMatch{ @@ -361,15 +349,9 @@ func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *struc eh := &envoyroute.HeaderMatcher{ Name: ":method", - } - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ + HeaderMatchSpecifier: &envoyroute.HeaderMatcher_SafeRegexMatch{ SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex), - } - } else { - eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_RegexMatch{ - RegexMatch: methodHeaderRegex, - } + }, } em.Headers = append(em.Headers, eh) @@ -384,37 +366,24 @@ func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *struc switch { case qm.Exact != "": - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ - StringMatch: &envoymatcher.StringMatcher{ - MatchPattern: &envoymatcher.StringMatcher_Exact{ - Exact: qm.Exact, - }, + eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ + StringMatch: &envoymatcher.StringMatcher{ + MatchPattern: &envoymatcher.StringMatcher_Exact{ + Exact: qm.Exact, }, - } - } else { - eq.Value = qm.Exact + }, } case qm.Regex != "": - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ - StringMatch: &envoymatcher.StringMatcher{ - MatchPattern: &envoymatcher.StringMatcher_SafeRegex{ - SafeRegex: makeEnvoyRegexMatch(qm.Regex), - }, + eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ + StringMatch: &envoymatcher.StringMatcher{ + MatchPattern: &envoymatcher.StringMatcher_SafeRegex{ + SafeRegex: makeEnvoyRegexMatch(qm.Regex), }, - } - } else { - eq.Value = qm.Regex - eq.Regex = makeBoolValue(true) + }, } case qm.Present: - if cInfo.ProxyFeatures.RouterMatchSafeRegex { - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_PresentMatch{ - PresentMatch: true, - } - } else { - eq.Value = "" + eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_PresentMatch{ + PresentMatch: true, } default: continue // skip this impossible situation diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go index 327eabe58..ba3d21e74 100644 --- a/agent/xds/routes_test.go +++ b/agent/xds/routes_test.go @@ -11,6 +11,7 @@ import ( "github.com/hashicorp/consul/agent/consul/discoverychain" "github.com/hashicorp/consul/agent/proxycfg" "github.com/hashicorp/consul/agent/structs" + "github.com/hashicorp/consul/agent/xds/proxysupport" testinf "github.com/mitchellh/go-testing-interface" "github.com/stretchr/testify/require" ) @@ -175,8 +176,9 @@ func TestRoutesFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range supportedEnvoyVersions { - sf := determineSupportedProxyFeaturesFromString(envoyVersion) + for _, envoyVersion := range proxysupport.EnvoyVersions { + sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) + require.NoError(t, err) t.Run("envoy-"+envoyVersion, func(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { diff --git a/agent/xds/server.go b/agent/xds/server.go index 345080db9..5dc5f967e 100644 --- a/agent/xds/server.go +++ b/agent/xds/server.go @@ -311,7 +311,11 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest) if node == nil && req.Node != nil { node = req.Node - proxyFeatures = determineSupportedProxyFeatures(req.Node) + var err error + proxyFeatures, err = determineSupportedProxyFeatures(req.Node) + if err != nil { + return status.Errorf(codes.InvalidArgument, err.Error()) + } } if handler, ok := handlers[req.TypeUrl]; ok { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-limits.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-11-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-11-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/defaults.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-11-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-11-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-11-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-11-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-11-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/defaults.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-11-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-11-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-11-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-11-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-11-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-11-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-11-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-11-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-11-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-11-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-11-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-11-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-11-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-11-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-11-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-11-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-11-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-11-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-11-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-11-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-11-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-11-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-11-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-11-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-11-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-11-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-11-x.golden rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-11-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-11-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-15-x.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-11-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-15-x.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-11-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-15-x.golden diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 6cee50429..2fe0c978b 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -15,6 +15,7 @@ import ( "github.com/hashicorp/consul/agent/structs" "github.com/hashicorp/consul/agent/xds" + "github.com/hashicorp/consul/agent/xds/proxysupport" "github.com/hashicorp/consul/api" proxyCmd "github.com/hashicorp/consul/command/connect/proxy" "github.com/hashicorp/consul/command/flags" @@ -68,10 +69,9 @@ type cmd struct { gatewayKind api.ServiceKind } -const ( - defaultEnvoyVersion = "1.14.4" - meshGatewayVal = "mesh" -) +const meshGatewayVal = "mesh" + +var defaultEnvoyVersion = proxysupport.EnvoyVersions[0] var supportedGateways = map[string]api.ServiceKind{ "mesh": api.ServiceKindMeshGateway, diff --git a/command/connect/envoy/exec_test.go b/command/connect/envoy/exec_test.go index c7703a75c..25039c8f6 100644 --- a/command/connect/envoy/exec_test.go +++ b/command/connect/envoy/exec_test.go @@ -29,8 +29,6 @@ func TestExecEnvoy(t *testing.T) { "--config-path", "{{ got.ConfigPath }}", "--disable-hot-restart", - "--max-obj-name-len", - "256", "--fake-envoy-arg", }, }, @@ -44,8 +42,6 @@ func TestExecEnvoy(t *testing.T) { // that value further below. "{{ got.ConfigPath }}", // No --disable-hot-restart - "--max-obj-name-len", - "256", "--fake-envoy-arg", "--restart-epoch", "1", @@ -61,8 +57,6 @@ func TestExecEnvoy(t *testing.T) { // that value further below. "{{ got.ConfigPath }}", // No --disable-hot-restart - "--max-obj-name-len", - "256", "--fake-envoy-arg", // Restart epoch defaults to 0 if not given and not disabled. "--drain-time-s", @@ -79,8 +73,6 @@ func TestExecEnvoy(t *testing.T) { // that value further below. "{{ got.ConfigPath }}", // No --disable-hot-restart - "--max-obj-name-len", - "256", "--fake-envoy-arg", // Restart epoch defaults to 0 if not given and not disabled. "--parent-shutdown-time-s", @@ -97,8 +89,6 @@ func TestExecEnvoy(t *testing.T) { // that value further below. "{{ got.ConfigPath }}", // No --disable-hot-restart - "--max-obj-name-len", - "256", "--fake-envoy-arg", // Restart epoch defaults to 0 if not given and not disabled. "--hot-restart-version", diff --git a/command/connect/envoy/exec_unix.go b/command/connect/envoy/exec_unix.go index 39bdc68a0..0914d3665 100644 --- a/command/connect/envoy/exec_unix.go +++ b/command/connect/envoy/exec_unix.go @@ -49,17 +49,6 @@ func hasHotRestartOption(argSets ...[]string) bool { return false } -func hasMaxObjNameLenOption(argSets ...[]string) bool { - for _, args := range argSets { - for _, opt := range args { - if opt == "--max-obj-name-len" { - return true - } - } - } - return false -} - func makeBootstrapPipe(bootstrapJSON []byte) (string, error) { pipeFile := filepath.Join(os.TempDir(), fmt.Sprintf("envoy-%x-bootstrap.json", time.Now().UnixNano()+int64(os.Getpid()))) @@ -141,9 +130,6 @@ func execEnvoy(binary string, prefixArgs, suffixArgs []string, bootstrapJSON []b if disableHotRestart { envoyArgs = append(envoyArgs, "--disable-hot-restart") } - if !hasMaxObjNameLenOption(prefixArgs, suffixArgs) { - envoyArgs = append(envoyArgs, "--max-obj-name-len", "256") - } envoyArgs = append(envoyArgs, suffixArgs...) // Exec 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 8e132ef83..0c8cf0072 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index 9c49326db..5a2fa3c0f 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 4b5f0c287..e13e4a108 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index 157df92dc..17b99b375 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index cb7f2993b..40fb5d616 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 288c626d9..a0be6b091 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index d4df20a16..f8e925c1f 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index d4df20a16..f8e925c1f 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index d4df20a16..f8e925c1f 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 3d400e990..c8bb597da 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.14.4" + "envoy_version": "1.15.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 78f4b3a5a..f84695216 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.14.4" + "envoy_version": "1.15.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 ea3c9d37d..65735e6ee 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.14.4" + "envoy_version": "1.15.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 59f667074..3e4e03a74 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.14.4" + "envoy_version": "1.15.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 a3b51e0be..294d3883a 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 380fe29c2..7bf22d21a 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index caddf5aec..a4f0730ce 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index a06c00a7f..74b929658 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index a06c00a7f..74b929658 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index a06c00a7f..74b929658 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index a06c00a7f..74b929658 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 02c36b0ce..a43d4f125 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.14.4" + "envoy_version": "1.15.0" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index bd02ad595..471b58037 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.14.4"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.15.0"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then diff --git a/website/pages/docs/commands/connect/envoy.mdx b/website/pages/docs/commands/connect/envoy.mdx index 82964bd41..142765ac0 100644 --- a/website/pages/docs/commands/connect/envoy.mdx +++ b/website/pages/docs/commands/connect/envoy.mdx @@ -76,7 +76,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.14.4`. This is required so that the correct configuration can be generated. + `1.15.0`. This is required so that the correct configuration can be generated. - `-- [pass-through options]` - Any options given after a double dash are passed directly through to the `envoy` invocation. See [Envoy's diff --git a/website/pages/docs/connect/proxies/envoy.mdx b/website/pages/docs/connect/proxies/envoy.mdx index 07b0e25d6..5be9b035b 100644 --- a/website/pages/docs/connect/proxies/envoy.mdx +++ b/website/pages/docs/connect/proxies/envoy.mdx @@ -26,7 +26,7 @@ definition](/docs/connect/registration/service-registration) allowing you to use the more powerful features of Envoy. ~> **Note:** When using Envoy with Consul and not using the [`consul connect envoy` command](/docs/commands/connect/envoy) -Envoy must be run with the `--max-obj-name-len` option set to `256` or greater. +Envoy must be run with the `--max-obj-name-len` option set to `256` or greater for Envoy versions prior to 1.11.0. ## Supported Versions @@ -35,6 +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.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.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0† |