xds: default to speaking xDS v3, but allow for v2 to be spoken upon r…

…equest

- Also bump all of the envoy versions to the latest point releases.

.circleci/config.yml

@@ -779,14 +779,14 @@ jobs:
           command: bash <(curl -s https://codecov.io/bash) -v -c -C $CIRCLE_SHA1 -F ui
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_14_5: &ENVOY_TESTS
+  envoy-integration-test-1_14_6: &ENVOY_TESTS
     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
     parallelism: 2
     environment:
-      ENVOY_VERSION: "1.14.5"
+      ENVOY_VERSION: "1.14.6"
     steps: &ENVOY_INTEGRATION_TEST_STEPS
       - checkout
       # Get go binary from workspace
@@ -819,17 +819,38 @@ jobs:
           path: *TEST_RESULTS_DIR
       - run: *notify-slack-failure
 
-  envoy-integration-test-1_15_2:
+  envoy-integration-test-1_14_6-v2compat:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.15.2"
+      ENVOY_VERSION: "1.14.6"
+      TEST_V2_XDS: "1"
 
-  envoy-integration-test-1_16_0:
+  envoy-integration-test-1_15_3:
     <<: *ENVOY_TESTS
     environment:
-      ENVOY_VERSION: "1.16.0"
+      ENVOY_VERSION: "1.15.3"
 
-  # TODO(rb): add in 1.17.0 support when v3 is ready
+  envoy-integration-test-1_15_3-v2compat:
+    <<: *ENVOY_TESTS
+    environment:
+      ENVOY_VERSION: "1.15.3"
+      TEST_V2_XDS: "1"
+
+  envoy-integration-test-1_16_2:
+    <<: *ENVOY_TESTS
+    environment:
+      ENVOY_VERSION: "1.16.2"
+
+  envoy-integration-test-1_16_2-v2compat:
+    <<: *ENVOY_TESTS
+    environment:
+      ENVOY_VERSION: "1.16.2"
+      TEST_V2_XDS: "1"
+
+  envoy-integration-test-1_17_0:
+    <<: *ENVOY_TESTS
+    environment:
+      ENVOY_VERSION: "1.17.0"
 
   # run integration tests for the connect ca providers
   test-connect-ca-providers:
@@ -1039,16 +1060,27 @@ workflows:
       - nomad-integration-0_8:
           requires:
             - dev-build
-      - envoy-integration-test-1_14_5:
+      - envoy-integration-test-1_14_6:
+          requires:
+            - dev-build
+      - envoy-integration-test-1_14_6-v2compat:
+          requires:
+            - dev-build
+      - envoy-integration-test-1_15_3:
+          requires:
+            - dev-build
+      - envoy-integration-test-1_15_3-v2compat:
+          requires:
+            - dev-build
+      - envoy-integration-test-1_16_2:
           requires:
             - dev-build
-      - envoy-integration-test-1_15_2:
+      - envoy-integration-test-1_16_2-v2compat:
           requires:
             - dev-build
-      - envoy-integration-test-1_16_0:
+      - envoy-integration-test-1_17_0:
           requires:
             - dev-build
-  # TODO(rb): add in 1.17.0 support when v3 is ready
 
   website:
     unless: << pipeline.parameters.trigger-load-test >>