connect: Add Envoy 1.21.1 to support matrix, remove 1.17.4 (#12777)

.changelog/12777.txt

@@ -0,0 +1,3 @@
+```release-note:improvement
+connect: Add Envoy 1.21.1 to support matrix, remove 1.17.4
+```

.circleci/config.yml

@@ -845,13 +845,13 @@ jobs:
           command: make test-coverage-ci
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_17_4: &ENVOY_TESTS
+  envoy-integration-test-1_18_6: &ENVOY_TESTS
     machine:
       image: ubuntu-2004:202101-01
     parallelism: 4
     resource_class: medium
     environment:
-      ENVOY_VERSION: "1.17.4"
+      ENVOY_VERSION: "1.18.6"
     steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
@@ -884,11 +884,6 @@ jobs:
           path: *TEST_RESULTS_DIR
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_18_6:
-    <<: *ENVOY_TESTS
-    environment:
-      ENVOY_VERSION: "1.18.6"
-
   envoy-integration-test-1_19_3:
     <<: *ENVOY_TESTS
     environment:
@@ -899,6 +894,11 @@ jobs:
     environment:
       ENVOY_VERSION: "1.20.2"
 
+  envoy-integration-test-1_21_1:
+    <<: *ENVOY_TESTS
+    environment:
+      ENVOY_VERSION: "1.21.1"
+
   # run integration tests for the connect ca providers
   test-connect-ca-providers:
     docker:
@@ -1140,9 +1140,6 @@ workflows:
       - nomad-integration-0_8:
           requires:
             - dev-build
-      - envoy-integration-test-1_17_4:
-          requires:
-            - dev-build
       - envoy-integration-test-1_18_6:
           requires:
             - dev-build
@@ -1152,6 +1149,9 @@ workflows:
       - envoy-integration-test-1_20_2:
           requires:
             - dev-build
+      - envoy-integration-test-1_21_1:
+          requires:
+            - dev-build
 
   website:
     unless: << pipeline.parameters.trigger-load-test >>

agent/xds/envoy_versioning.go

@@ -11,7 +11,7 @@ import (
 var (
 	// minSupportedVersion is the oldest mainline version we support. This should always be
 	// the zero'th point release of the last element of proxysupport.EnvoyVersions.
-	minSupportedVersion = version.Must(version.NewVersion("1.17.0"))
+	minSupportedVersion = version.Must(version.NewVersion("1.18.0"))
 
 	minVersionToForceLDSandCDSToAlwaysUseWildcardsOnReconnect = version.Must(version.NewVersion("1.19.0"))
 

agent/xds/envoy_versioning_test.go

@@ -123,7 +123,6 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	// Insert a bunch of valid versions.
 	// Populate feature flags here when appropriate. See consul 1.10.x for reference.
 	for _, v := range []string{
-		"1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4",
 		"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4", "1.18.5", "1.18.6",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{
@@ -133,6 +132,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
 	for _, v := range []string{
 		"1.19.0", "1.19.1", "1.19.2", "1.19.3",
 		"1.20.0", "1.20.1", "1.20.2",
+		"1.21.1",
 	} {
 		cases[v] = testcase{expect: supportedProxyFeatures{}}
 	}

agent/xds/golden_test.go

@@ -35,7 +35,11 @@ func goldenEnvoy(t *testing.T, name, envoyVersion, latestEnvoyVersion, got strin
 	// coalescing works below when there is no xDS generated skew across envoy
 	// versions.
 	subname := goldenEnvoyVersionName(t, envoyVersion)
-	latestSubname := goldenEnvoyVersionName(t, latestEnvoyVersion)
+
+	latestSubname := "latest"
+	if envoyVersion == latestEnvoyVersion {
+		subname = "latest"
+	}
 
 	return golden(t, name, subname, latestSubname, got)
 }
@@ -85,7 +89,7 @@ func golden(t *testing.T, name, subname, latestSubname, got string) string {
 	if latestSubname != "" && subname != latestSubname {
 		latestGolden := filepath.Join("testdata", fmt.Sprintf("%s.%s.golden", name, latestSubname))
 		raw, err := ioutil.ReadFile(latestGolden)
-		require.NoError(t, err)
+		require.NoError(t, err, "%q %q %q", name, subname, latestSubname)
 		latestExpected = string(raw)
 	}
 

agent/xds/proxysupport/proxysupport.go

@@ -7,8 +7,8 @@ package proxysupport
 //
 // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
 var EnvoyVersions = []string{
+	"1.21.1",
 	"1.20.2",
 	"1.19.3",
 	"1.18.6",
-	"1.17.4",
 }