diff --git a/.circleci/config.yml b/.circleci/config.yml index 06bcda1f4f6c..d98e47fc4a7d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -691,13 +691,13 @@ jobs: command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui - run: *notify-slack-failure - envoy-integration-test-1.12.6: + envoy-integration-test-1.11.2: docker: # We only really need bash and docker-compose which is installed on all # Circle images but pick Go since we have to pick one of them. - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.12.6" + ENVOY_VERSION: "1.11.2" steps: &ENVOY_INTEGRATION_TEST_STEPS - checkout # Get go binary from workspace @@ -726,25 +726,25 @@ jobs: path: *TEST_RESULTS_DIR - run: *notify-slack-failure - envoy-integration-test-1.13.4: + envoy-integration-test-1.12.6: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.13.4" + ENVOY_VERSION: "1.12.6" steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.14.4: + envoy-integration-test-1.13.4: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.14.4" + ENVOY_VERSION: "1.13.4" steps: *ENVOY_INTEGRATION_TEST_STEPS - envoy-integration-test-1.15.0: + envoy-integration-test-1.14.4: docker: - image: *GOLANG_IMAGE environment: - ENVOY_VERSION: "1.15.0" + ENVOY_VERSION: "1.14.4" steps: *ENVOY_INTEGRATION_TEST_STEPS # run integration tests for the connect ca providers @@ -859,6 +859,9 @@ 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 @@ -868,9 +871,6 @@ 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 856ab6745639..63accb8931bc 100644 --- a/agent/xds/clusters_test.go +++ b/agent/xds/clusters_test.go @@ -11,7 +11,6 @@ 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" @@ -528,9 +527,8 @@ func TestClustersFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range proxysupport.EnvoyVersions { - sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) - require.NoError(t, err) + for _, envoyVersion := range supportedEnvoyVersions { + sf := determineSupportedProxyFeaturesFromString(envoyVersion) t.Run("envoy-"+envoyVersion, func(t *testing.T) { for _, tt := range tests { t.Run(tt.name, func(t *testing.T) { @@ -739,3 +737,13 @@ 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 8d7b5db4296d..557bd054eb32 100644 --- a/agent/xds/endpoints_test.go +++ b/agent/xds/endpoints_test.go @@ -14,7 +14,6 @@ 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" ) @@ -555,9 +554,8 @@ func Test_endpointsFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range proxysupport.EnvoyVersions { - sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) - require.NoError(t, err) + for _, envoyVersion := range supportedEnvoyVersions { + sf := determineSupportedProxyFeaturesFromString(envoyVersion) 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 1ed297f4dc13..9e3d0d37aa5f 100644 --- a/agent/xds/envoy_versioning.go +++ b/agent/xds/envoy_versioning.go @@ -9,37 +9,25 @@ import ( ) var ( - // minSupportedVersion is the oldest mainline version we support. This should always be - // the zero'th point release of the last element of proxysupport.EnvoyVersions. - minSupportedVersion = version.Must(version.NewVersion("1.12.0")) + // 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")) ) type supportedProxyFeatures struct { - // add version dependent feature flags here + RouterMatchSafeRegex bool // use safe_regex instead of regex in http.router rules } -func determineSupportedProxyFeatures(node *envoycore.Node) (supportedProxyFeatures, error) { +func determineSupportedProxyFeatures(node *envoycore.Node) supportedProxyFeatures { 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 { - // This would happen on either extremely old builds OR perhaps on - // custom builds. Should we error? - return supportedProxyFeatures{}, nil + return supportedProxyFeatures{} } - if version.LessThan(minSupportedVersion) { - return supportedProxyFeatures{}, fmt.Errorf("Envoy %s is too old and is not supported by Consul", version) + return supportedProxyFeatures{ + RouterMatchSafeRegex: !version.LessThan(minSafeRegexVersion), } - - return supportedProxyFeatures{}, nil } // example: 1580db37e9a97c37e410bad0e1507ae1a0fd9e77/1.12.4/Clean/RELEASE/BoringSSL @@ -86,3 +74,10 @@ 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 b972eaf5d7ef..eb6242a45f7a 100644 --- a/agent/xds/listeners_test.go +++ b/agent/xds/listeners_test.go @@ -11,7 +11,6 @@ import ( "github.com/envoyproxy/go-control-plane/pkg/wellknown" "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" @@ -494,9 +493,8 @@ func TestListenersFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range proxysupport.EnvoyVersions { - sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) - require.NoError(t, err) + for _, envoyVersion := range supportedEnvoyVersions { + sf := determineSupportedProxyFeaturesFromString(envoyVersion) 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 deleted file mode 100644 index ed4be6048631..000000000000 --- a/agent/xds/proxysupport/proxysupport.go +++ /dev/null @@ -1,14 +0,0 @@ -package proxysupport - -// EnvoyVersions lists the latest officially supported versions of envoy. -// -// This list must be sorted by semver descending. Only one point release for -// each major release should be present. -// -// 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 a7660d16848d..e8b83a962e4e 100644 --- a/agent/xds/routes.go +++ b/agent/xds/routes.go @@ -277,7 +277,7 @@ func makeUpstreamRouteForDiscoveryChain( return host, nil } -func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.DiscoveryRoute) *envoyroute.RouteMatch { +func makeRouteMatchForDiscoveryRoute(cInfo connectionInfo, discoveryRoute *structs.DiscoveryRoute) *envoyroute.RouteMatch { match := discoveryRoute.Definition.Match if match == nil || match.IsEmpty() { return makeDefaultRouteMatch() @@ -295,8 +295,14 @@ func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.D Prefix: match.HTTP.PathPrefix, } case match.HTTP.PathRegex != "": - em.PathSpecifier = &envoyroute.RouteMatch_SafeRegex{ - SafeRegex: makeEnvoyRegexMatch(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, + } } default: em.PathSpecifier = &envoyroute.RouteMatch_Prefix{ @@ -317,8 +323,14 @@ func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.D ExactMatch: hdr.Exact, } case hdr.Regex != "": - eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ - SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex), + if cInfo.ProxyFeatures.RouterMatchSafeRegex { + eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ + SafeRegexMatch: makeEnvoyRegexMatch(hdr.Regex), + } + } else { + eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_RegexMatch{ + RegexMatch: hdr.Regex, + } } case hdr.Prefix != "": eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_PrefixMatch{ @@ -349,9 +361,15 @@ func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.D eh := &envoyroute.HeaderMatcher{ Name: ":method", - HeaderMatchSpecifier: &envoyroute.HeaderMatcher_SafeRegexMatch{ + } + if cInfo.ProxyFeatures.RouterMatchSafeRegex { + eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_SafeRegexMatch{ SafeRegexMatch: makeEnvoyRegexMatch(methodHeaderRegex), - }, + } + } else { + eh.HeaderMatchSpecifier = &envoyroute.HeaderMatcher_RegexMatch{ + RegexMatch: methodHeaderRegex, + } } em.Headers = append(em.Headers, eh) @@ -366,24 +384,37 @@ func makeRouteMatchForDiscoveryRoute(_ connectionInfo, discoveryRoute *structs.D switch { case qm.Exact != "": - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ - StringMatch: &envoymatcher.StringMatcher{ - MatchPattern: &envoymatcher.StringMatcher_Exact{ - Exact: qm.Exact, + if cInfo.ProxyFeatures.RouterMatchSafeRegex { + eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ + StringMatch: &envoymatcher.StringMatcher{ + MatchPattern: &envoymatcher.StringMatcher_Exact{ + Exact: qm.Exact, + }, }, - }, + } + } else { + eq.Value = qm.Exact } case qm.Regex != "": - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_StringMatch{ - StringMatch: &envoymatcher.StringMatcher{ - MatchPattern: &envoymatcher.StringMatcher_SafeRegex{ - SafeRegex: makeEnvoyRegexMatch(qm.Regex), + if cInfo.ProxyFeatures.RouterMatchSafeRegex { + 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: - eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_PresentMatch{ - PresentMatch: true, + if cInfo.ProxyFeatures.RouterMatchSafeRegex { + eq.QueryParameterMatchSpecifier = &envoyroute.QueryParameterMatcher_PresentMatch{ + PresentMatch: true, + } + } else { + eq.Value = "" } default: continue // skip this impossible situation diff --git a/agent/xds/routes_test.go b/agent/xds/routes_test.go index ba3d21e74fe6..327eabe5818d 100644 --- a/agent/xds/routes_test.go +++ b/agent/xds/routes_test.go @@ -11,7 +11,6 @@ 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" ) @@ -176,9 +175,8 @@ func TestRoutesFromSnapshot(t *testing.T) { }, } - for _, envoyVersion := range proxysupport.EnvoyVersions { - sf, err := determineSupportedProxyFeaturesFromString(envoyVersion) - require.NoError(t, err) + for _, envoyVersion := range supportedEnvoyVersions { + sf := determineSupportedProxyFeaturesFromString(envoyVersion) 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 09f3c1d3fd79..bc5535e47047 100644 --- a/agent/xds/server.go +++ b/agent/xds/server.go @@ -297,11 +297,7 @@ func (s *Server) process(stream ADSStream, reqCh <-chan *envoy.DiscoveryRequest) if node == nil && req.Node != nil { node = req.Node - var err error - proxyFeatures, err = determineSupportedProxyFeatures(req.Node) - if err != nil { - return status.Errorf(codes.InvalidArgument, err.Error()) - } + proxyFeatures = determineSupportedProxyFeatures(req.Node) } if handler, ok := handlers[req.TypeUrl]; ok { diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-limits-max-connections-only.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-limits-set-to-zero.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-limits.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-limits.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-limits.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-limits.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-local-app.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-local-app.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-local-app.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-local-app.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-timeouts.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-timeouts.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-timeouts.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-timeouts.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-upstream-default-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/custom-upstream.envoy-1-15-x.golden b/agent/xds/testdata/clusters/custom-upstream.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/custom-upstream.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/custom-upstream.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/defaults.envoy-1-15-x.golden b/agent/xds/testdata/clusters/defaults.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/defaults.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/defaults.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-15-x.golden b/agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/expose-paths-grpc-new-cluster-http1.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-15-x.golden b/agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/expose-paths-local-app-paths.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-15-x.golden b/agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/expose-paths-new-cluster-http2.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-failover.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-ignore-extra-resolvers.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-service-timeouts.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway-using-federation-states.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/mesh-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/mesh-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/mesh-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/mesh-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-hostname-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-ignore-extra-resolvers.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/terminating-gateway-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/clusters/terminating-gateway.envoy-1-15-x.golden b/agent/xds/testdata/clusters/terminating-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/clusters/terminating-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/clusters/terminating-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-failover.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-default-chain-and-custom-cluster.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/defaults.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/defaults.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/defaults.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/defaults.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-multiple-listeners-duplicate-service.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-failover.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-double-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway-triggered.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-default-service-subset.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway-using-federation-states.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/mesh-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/mesh-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/mesh-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-default-service-subset.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-15-x.golden b/agent/xds/testdata/endpoints/terminating-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/endpoints/terminating-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/endpoints/terminating-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-grpc-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-http2-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/connect-proxy-with-tcp-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-public-listener.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-public-listener.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/custom-public-listener.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/custom-upstream-typed-ignored-with-disco-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden b/agent/xds/testdata/listeners/custom-upstream.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/custom-upstream.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/custom-upstream.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden b/agent/xds/testdata/listeners/defaults.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/defaults.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/defaults.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden b/agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/expose-paths-local-app-paths.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden b/agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/expose-paths-new-cluster-http2.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/http-public-listener.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-public-listener.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/http-public-listener.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden b/agent/xds/testdata/listeners/http-upstream.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/http-upstream.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/http-upstream.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-bind-addrs.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-http-multiple-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-local-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-with-tcp-chain-failover-through-remote-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden b/agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/ingress-with-tls-listener.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/listener-bind-address-port.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-address.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-address.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/listener-bind-address.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden b/agent/xds/testdata/listeners/listener-bind-port.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/listener-bind-port.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/listener-bind-port.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-custom-addresses.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-tagged-addresses.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/mesh-gateway-using-federation-states.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/mesh-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/mesh-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/mesh-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-custom-and-tagged-addresses.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-api-cert.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-no-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/terminating-gateway-service-subsets.envoy-1-11-x.golden diff --git a/agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden b/agent/xds/testdata/listeners/terminating-gateway.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/listeners/terminating-gateway.envoy-1-15-x.golden rename to agent/xds/testdata/listeners/terminating-gateway.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-router.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-and-splitter.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-15-x.golden b/agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-15-x.golden rename to agent/xds/testdata/routes/connect-proxy-with-grpc-router.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/defaults-no-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/defaults-no-chain.envoy-1-15-x.golden rename to agent/xds/testdata/routes/defaults-no-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-defaults-no-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-http-multiple-services.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-overrides.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-router.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-and-splitter.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-chain-external-sni.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-chain.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-chain.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-chain.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-15-x.golden b/agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-15-x.golden rename to agent/xds/testdata/routes/ingress-with-grpc-router.envoy-1-11-x.golden diff --git a/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-15-x.golden b/agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-11-x.golden similarity index 100% rename from agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-15-x.golden rename to agent/xds/testdata/routes/splitter-with-resolver-redirect.envoy-1-11-x.golden diff --git a/command/connect/envoy/envoy.go b/command/connect/envoy/envoy.go index 67530f0ec61c..0ded259e6fe2 100644 --- a/command/connect/envoy/envoy.go +++ b/command/connect/envoy/envoy.go @@ -14,7 +14,6 @@ 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" @@ -69,9 +68,10 @@ type cmd struct { gatewayKind api.ServiceKind } -const meshGatewayVal = "mesh" - -var defaultEnvoyVersion = proxysupport.EnvoyVersions[0] +const ( + defaultEnvoyVersion = "1.14.4" + meshGatewayVal = "mesh" +) 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 25039c8f6c5f..c7703a75c81c 100644 --- a/command/connect/envoy/exec_test.go +++ b/command/connect/envoy/exec_test.go @@ -29,6 +29,8 @@ func TestExecEnvoy(t *testing.T) { "--config-path", "{{ got.ConfigPath }}", "--disable-hot-restart", + "--max-obj-name-len", + "256", "--fake-envoy-arg", }, }, @@ -42,6 +44,8 @@ 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", @@ -57,6 +61,8 @@ 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", @@ -73,6 +79,8 @@ 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", @@ -89,6 +97,8 @@ 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 0914d3665981..39bdc68a0fac 100644 --- a/command/connect/envoy/exec_unix.go +++ b/command/connect/envoy/exec_unix.go @@ -49,6 +49,17 @@ 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()))) @@ -130,6 +141,9 @@ 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 27ebc5f4543c..d917bfd47e67 100644 --- a/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden +++ b/command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/access-log-path.golden b/command/connect/envoy/testdata/access-log-path.golden index e20699eb8f64..5ce083094090 100644 --- a/command/connect/envoy/testdata/access-log-path.golden +++ b/command/connect/envoy/testdata/access-log-path.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/defaults.golden b/command/connect/envoy/testdata/defaults.golden index 3866bbd8bc8e..dc38aba8672d 100644 --- a/command/connect/envoy/testdata/defaults.golden +++ b/command/connect/envoy/testdata/defaults.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/existing-ca-file.golden b/command/connect/envoy/testdata/existing-ca-file.golden index f1fce5d7d6c8..218ccb181285 100644 --- a/command/connect/envoy/testdata/existing-ca-file.golden +++ b/command/connect/envoy/testdata/existing-ca-file.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-multiple.golden b/command/connect/envoy/testdata/extra_-multiple.golden index b8cf3c48550a..f5ecf6cd19e0 100644 --- a/command/connect/envoy/testdata/extra_-multiple.golden +++ b/command/connect/envoy/testdata/extra_-multiple.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/extra_-single.golden b/command/connect/envoy/testdata/extra_-single.golden index 90e29172cd2d..c9d330978329 100644 --- a/command/connect/envoy/testdata/extra_-single.golden +++ b/command/connect/envoy/testdata/extra_-single.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-config.golden b/command/connect/envoy/testdata/grpc-addr-config.golden index 5e36f1b92d1b..f87d8fcaca4b 100644 --- a/command/connect/envoy/testdata/grpc-addr-config.golden +++ b/command/connect/envoy/testdata/grpc-addr-config.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-env.golden b/command/connect/envoy/testdata/grpc-addr-env.golden index 5e36f1b92d1b..f87d8fcaca4b 100644 --- a/command/connect/envoy/testdata/grpc-addr-env.golden +++ b/command/connect/envoy/testdata/grpc-addr-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-flag.golden b/command/connect/envoy/testdata/grpc-addr-flag.golden index 5e36f1b92d1b..f87d8fcaca4b 100644 --- a/command/connect/envoy/testdata/grpc-addr-flag.golden +++ b/command/connect/envoy/testdata/grpc-addr-flag.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/grpc-addr-unix.golden b/command/connect/envoy/testdata/grpc-addr-unix.golden index 86b147acac3a..e7a2a72b1bdc 100644 --- a/command/connect/envoy/testdata/grpc-addr-unix.golden +++ b/command/connect/envoy/testdata/grpc-addr-unix.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden index b020b9e59347..b92b13aa7a15 100644 --- a/command/connect/envoy/testdata/ingress-gateway-address-specified.golden +++ b/command/connect/envoy/testdata/ingress-gateway-address-specified.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden index 84744703ffe5..8f0c009512f8 100644 --- a/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden +++ b/command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden index 5bd97f0bbc38..f6953d040c6b 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden @@ -13,7 +13,7 @@ "id": "my-gateway-123", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden index 098363d089fb..27ce0753b9fc 100644 --- a/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden +++ b/command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden @@ -13,7 +13,7 @@ "id": "my-gateway", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/ingress-gateway.golden b/command/connect/envoy/testdata/ingress-gateway.golden index 962dcefe123d..17227b562d86 100644 --- a/command/connect/envoy/testdata/ingress-gateway.golden +++ b/command/connect/envoy/testdata/ingress-gateway.golden @@ -13,7 +13,7 @@ "id": "ingress-gateway-1", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/stats-config-override.golden b/command/connect/envoy/testdata/stats-config-override.golden index 4453d13b82a1..30a319a023e4 100644 --- a/command/connect/envoy/testdata/stats-config-override.golden +++ b/command/connect/envoy/testdata/stats-config-override.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-arg.golden b/command/connect/envoy/testdata/token-arg.golden index 5e0bf0f893b7..486fb00a3d15 100644 --- a/command/connect/envoy/testdata/token-arg.golden +++ b/command/connect/envoy/testdata/token-arg.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-env.golden b/command/connect/envoy/testdata/token-env.golden index 5e0bf0f893b7..486fb00a3d15 100644 --- a/command/connect/envoy/testdata/token-env.golden +++ b/command/connect/envoy/testdata/token-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-arg.golden b/command/connect/envoy/testdata/token-file-arg.golden index 5e0bf0f893b7..486fb00a3d15 100644 --- a/command/connect/envoy/testdata/token-file-arg.golden +++ b/command/connect/envoy/testdata/token-file-arg.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/token-file-env.golden b/command/connect/envoy/testdata/token-file-env.golden index 5e0bf0f893b7..486fb00a3d15 100644 --- a/command/connect/envoy/testdata/token-file-env.golden +++ b/command/connect/envoy/testdata/token-file-env.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/command/connect/envoy/testdata/zipkin-tracing-config.golden b/command/connect/envoy/testdata/zipkin-tracing-config.golden index 1db13556b171..e9d4c9899566 100644 --- a/command/connect/envoy/testdata/zipkin-tracing-config.golden +++ b/command/connect/envoy/testdata/zipkin-tracing-config.golden @@ -13,7 +13,7 @@ "id": "test-proxy", "metadata": { "namespace": "default", - "envoy_version": "1.15.0" + "envoy_version": "1.14.4" } }, "static_resources": { diff --git a/test/integration/connect/envoy/run-tests.sh b/test/integration/connect/envoy/run-tests.sh index 471b5803706c..bd02ad595cf5 100755 --- a/test/integration/connect/envoy/run-tests.sh +++ b/test/integration/connect/envoy/run-tests.sh @@ -6,7 +6,7 @@ set -eEuo pipefail DEBUG=${DEBUG:-} # ENVOY_VERSION to run each test against -ENVOY_VERSION=${ENVOY_VERSION:-"1.15.0"} +ENVOY_VERSION=${ENVOY_VERSION:-"1.14.4"} export ENVOY_VERSION if [ ! -z "$DEBUG" ] ; then diff --git a/website/pages/commands/connect/envoy.mdx b/website/pages/commands/connect/envoy.mdx index 700f06ded80c..c8be96214096 100644 --- a/website/pages/commands/connect/envoy.mdx +++ b/website/pages/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.15.0`. This is required so that the correct configuration can be generated. + `1.14.4`. 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 fa452c7afa18..4b6ec8e80c11 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 for Envoy versions prior to 1.11.0. +Envoy must be run with the `--max-obj-name-len` option set to `256` or greater. ## Supported Versions @@ -35,7 +35,6 @@ 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† |