luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

connect: support envoy 1.14.1 (#7624)

This commit is contained in:
Hans Hasselberg 2020-04-09 20:58:22 +02:00 committed by GitHub
parent 071d4ee395
commit b78220981c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
.circleci/config.yml
View File

@ -554,13 +554,13 @@ jobs:
- store_test_results: - store_test_results:
path: ui-v2/test-results path: ui-v2/test-results
envoy-integration-test-1.10.0: envoy-integration-test-1.11.2:
docker: docker:
# We only really need bash and docker-compose which is installed on all # 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. # Circle images but pick Go since we have to pick one of them.
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSIONS: "1.10.0" ENVOY_VERSIONS: "1.11.2"
steps: &ENVOY_INTEGRATION_TEST_STEPS steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout - checkout
# Get go binary from workspace # Get go binary from workspace
@ -579,13 +579,6 @@ jobs:
path: ./test/integration/connect/envoy/workdir/logs path: ./test/integration/connect/envoy/workdir/logs
destination: container-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: envoy-integration-test-1.12.2:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
@ -593,11 +586,18 @@ jobs:
ENVOY_VERSIONS: "1.12.2" ENVOY_VERSIONS: "1.12.2"
steps: *ENVOY_INTEGRATION_TEST_STEPS steps: *ENVOY_INTEGRATION_TEST_STEPS
envoy-integration-test-1.13.0: envoy-integration-test-1.13.1:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: 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 steps: *ENVOY_INTEGRATION_TEST_STEPS
# run integration tests for the connect ca providers # run integration tests for the connect ca providers
@ -708,16 +708,16 @@ workflows:
- nomad-integration-0_8: - nomad-integration-0_8:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.10.0:
requires:
- dev-build
- envoy-integration-test-1.11.2: - envoy-integration-test-1.11.2:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.12.2: - envoy-integration-test-1.12.2:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.13.0: - envoy-integration-test-1.13.1:
requires:
- dev-build
- envoy-integration-test-1.14.1:
requires: requires:
- dev-build - dev-build

2
command/connect/envoy/envoy.go
View File

@ -70,7 +70,7 @@ type cmd struct {
} }
const ( const (
defaultEnvoyVersion = "1.13.1" defaultEnvoyVersion = "1.14.1"
meshGatewayVal = "mesh" meshGatewayVal = "mesh"
) )

2
command/connect/envoy/testdata/access-log-path.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/defaults.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/existing-ca-file.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/extra_-multiple.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/extra_-single.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/grpc-addr-config.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/grpc-addr-env.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/grpc-addr-flag.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/grpc-addr-unix.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/stats-config-override.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/token-arg.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/token-env.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/token-file-arg.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/token-file-env.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/zipkin-tracing-config.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.13.1" "envoy_version": "1.14.1"
} }
}, },
"static_resources": { "static_resources": {

2
test/integration/connect/envoy/run-tests.sh
View File

@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-}
STOP_ON_FAIL=${STOP_ON_FAIL:-} STOP_ON_FAIL=${STOP_ON_FAIL:-}
# ENVOY_VERSIONS is the list of envoy versions to run each test against # 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 if [ ! -z "$DEBUG" ] ; then
set -x set -x

3
website/source/docs/connect/proxies/envoy.md
View File

@ -36,7 +36,8 @@ compatible Envoy versions.
| Consul Version | 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.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.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† | | 1.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |