connect: support envoy 1.14.1 (#7624)

2020-04-09 20:58:22 +02:00 · 2020-04-09 20:58:22 +02:00 · 66415be90e
parent 4a6569a4e3
commit 66415be90e
19 changed files with 34 additions and 33 deletions
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@ -554,13 +554,13 @@ jobs:
      - store_test_results:
          path: ui-v2/test-results

-  envoy-integration-test-1.10.0:
+  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_VERSIONS: "1.10.0"
+      ENVOY_VERSIONS: "1.11.2"
    steps: &ENVOY_INTEGRATION_TEST_STEPS
      - checkout
      # Get go binary from workspace
@ -579,13 +579,6 @@ jobs:
          path: ./test/integration/connect/envoy/workdir/logs
          destination: container-logs

-  envoy-integration-test-1.11.2:
-    docker:
-      - image: *GOLANG_IMAGE
-    environment:
-      ENVOY_VERSIONS: "1.11.2"
-    steps: *ENVOY_INTEGRATION_TEST_STEPS
-
  envoy-integration-test-1.12.2:
    docker:
      - image: *GOLANG_IMAGE
@ -593,11 +586,18 @@ jobs:
      ENVOY_VERSIONS: "1.12.2"
    steps: *ENVOY_INTEGRATION_TEST_STEPS

-  envoy-integration-test-1.13.0:
+  envoy-integration-test-1.13.1:
    docker:
      - image: *GOLANG_IMAGE
    environment:
-      ENVOY_VERSIONS: "1.13.0"
+      ENVOY_VERSIONS: "1.13.1"
+    steps: *ENVOY_INTEGRATION_TEST_STEPS
+
+  envoy-integration-test-1.14.1:
+    docker:
+      - image: *GOLANG_IMAGE
+    environment:
+      ENVOY_VERSIONS: "1.14.1"
    steps: *ENVOY_INTEGRATION_TEST_STEPS

  # run integration tests for the connect ca providers
@ -708,16 +708,16 @@ workflows:
      - nomad-integration-0_8:
          requires:
            - dev-build
-      - envoy-integration-test-1.10.0:
-          requires:
-            - dev-build
      - envoy-integration-test-1.11.2:
          requires:
            - dev-build
      - envoy-integration-test-1.12.2:
          requires:
            - dev-build
-      - envoy-integration-test-1.13.0:
+      - envoy-integration-test-1.13.1:
+          requires:
+            - dev-build
+      - envoy-integration-test-1.14.1:
          requires:
            - dev-build

--- a/command/connect/envoy/envoy.go
+++ b/command/connect/envoy/envoy.go
@ -70,7 +70,7 @@ type cmd struct {
 }

 const (
-	defaultEnvoyVersion = "1.13.1"
+	defaultEnvoyVersion = "1.14.1"
 	meshGatewayVal      = "mesh"
 )

--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- 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.13.1"
+      "envoy_version": "1.14.1"
    }
  },
  "static_resources": {
--- a/test/integration/connect/envoy/run-tests.sh
+++ b/test/integration/connect/envoy/run-tests.sh
@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-}
 STOP_ON_FAIL=${STOP_ON_FAIL:-}

 # ENVOY_VERSIONS is the list of envoy versions to run each test against
-ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.3 1.13.1"}
+ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.11.2 1.12.3 1.13.1 1.14.1"}

 if [ ! -z "$DEBUG" ] ; then
  set -x
--- a/website/source/docs/connect/proxies/envoy.md
+++ b/website/source/docs/connect/proxies/envoy.md
@ -36,7 +36,8 @@ compatible Envoy versions.

 | Consul Version | Compatible Envoy Versions |
 |---|---|
-| 1.7.0 and higher | 1.13.1, 1.12.3, 1.11.2, 1.10.0* |
+| 1.8.x | 1.14.1, 1.13.1, 1.12.3, 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† |
 | 1.5.0, 1.5.1 | 1.9.1, 1.8.0† |
 | 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |