status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.14.6, 1.13.7 (#9737)

This commit is contained in:
R.B. Boyer 2021-02-10 13:11:15 -06:00 committed by GitHub
parent 9aa8081e42
commit 6eeccc93ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
34 changed files with 59 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/9737.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy point releases to 1.16.2, 1.15.3, 1.14.6, 1.13.7
```

24
.circleci/config.yml
View File

@ -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_13_6: &ENVOY_TESTS
envoy-integration-test-1_13_7: &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.13.6"
ENVOY_VERSION: "1.13.7"
steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout
# Get go binary from workspace
@ -819,20 +819,20 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure
envoy-integration-test-1_14_5:
envoy-integration-test-1_14_6:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.14.5"
ENVOY_VERSION: "1.14.6"
envoy-integration-test-1_15_2:
envoy-integration-test-1_15_3:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.15.2"
ENVOY_VERSION: "1.15.3"
envoy-integration-test-1_16_0:
envoy-integration-test-1_16_2:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.16.0"
ENVOY_VERSION: "1.16.2"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@ -1042,16 +1042,16 @@ workflows:
- nomad-integration-0_8:
requires:
- dev-build
- envoy-integration-test-1_13_6:
- envoy-integration-test-1_13_7:
requires:
- dev-build
- envoy-integration-test-1_14_5:
- envoy-integration-test-1_14_6:
requires:
- dev-build
- envoy-integration-test-1_15_2:
- envoy-integration-test-1_15_3:
requires:
- dev-build
- envoy-integration-test-1_16_0:
- envoy-integration-test-1_16_2:
requires:
- dev-build
website:

7
agent/xds/envoy_versioning_test.go
View File

@ -99,9 +99,10 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
// Insert a bunch of valid versions.
for _, v := range []string{
"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.14.1",
"1.14.2", "1.14.3", "1.14.4", "1.14.5",
"1.15.0", "1.15.1", "1.15.2", "1.16.0",
"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.13.7",
"1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.14.5", "1.14.6",
"1.15.0", "1.15.1", "1.15.2", "1.15.3",
"1.16.0", "1.16.1", "1.16.2",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}

8
agent/xds/proxysupport/proxysupport.go
View File

@ -7,8 +7,8 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.16.0",
"1.15.2",
"1.14.5",
"1.13.6",
"1.16.2",
"1.15.3",
"1.14.6",
"1.13.7",
}

2
agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-13-x.golden vendored
View File

@ -133,4 +133,4 @@
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
}

2
agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-14-x.golden vendored
View File

@ -133,4 +133,4 @@
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
}

2
agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-15-x.golden vendored
View File

@ -133,4 +133,4 @@
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
}

2
agent/xds/testdata/listeners/http-listener-with-timeouts.envoy-1-16-x.golden vendored
View File

@ -133,4 +133,4 @@
],
"typeUrl": "type.googleapis.com/envoy.api.v2.Listener",
"nonce": "00000001"
}
}

2
command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden vendored
View File

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

2
command/connect/envoy/testdata/ingress-gateway-address-specified.golden vendored
View File

@ -13,7 +13,7 @@
"id": "ingress-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.16.0"
"envoy_version": "1.16.2"
}
},
"static_resources": {

2
command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden vendored
View File

@ -13,7 +13,7 @@
"id": "ingress-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.16.0"
"envoy_version": "1.16.2"
}
},
"static_resources": {

2
command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden vendored
View File

@ -13,7 +13,7 @@
"id": "my-gateway-123",
"metadata": {
"namespace": "default",
"envoy_version": "1.16.0"
"envoy_version": "1.16.2"
}
},
"static_resources": {

2
command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden vendored
View File

@ -13,7 +13,7 @@
"id": "my-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.16.0"
"envoy_version": "1.16.2"
}
},
"static_resources": {

2
command/connect/envoy/testdata/ingress-gateway.golden vendored
View File

@ -13,7 +13,7 @@
"id": "ingress-gateway-1",
"metadata": {
"namespace": "default",
"envoy_version": "1.16.0"
"envoy_version": "1.16.2"
}
},
"static_resources": {

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
DEBUG=${DEBUG:-}
# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.0"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.2"}
export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then

5
test/integration/connect/envoy/test-envoy-versions.sh
View File

@ -18,15 +18,20 @@ versions=(
1.13.3
1.13.4
1.13.6
1.13.7
1.14.1
1.14.2
1.14.3
1.14.4
1.14.5
1.14.6
1.15.0
1.15.1
1.15.2
1.15.3
1.16.0
1.16.1
1.16.2
)
for v in "${versions[@]}"; do

2
website/content/commands/connect/envoy.mdx
View File

@ -74,7 +74,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.16.0`. This is required so that the correct configuration can be generated.
`1.16.2`. This is required so that the correct configuration can be generated.
- `-no-central-config` - By default the proxy's bootstrap configuration can be
customized centrally. This requires that the command run on the same agent

6
website/content/docs/connect/proxies/envoy.mdx
View File

@ -35,9 +35,9 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions |
| ------------------- | -------------------------------- |
| 1.9.x | 1.16.0, 1.15.2, 1.14.5‡, 1.13.6‡ |
| 1.8.x | 1.14.5, 1.13.6, 1.12.7, 1.11.2 |
| 1.7.x | 1.13.6, 1.12.7, 1.11.2, 1.10.0\* |
| 1.9.x | 1.16.2, 1.15.3, 1.14.6‡, 1.13.7‡ |
| 1.8.x | 1.14.6, 1.13.7, 1.12.7, 1.11.2 |
| 1.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0\* |
| 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0† |
| 1.5.1, 1.5.0 | 1.9.1, 1.8.0† |
| 1.4.x, 1.3.x | 1.9.1, 1.8.0†, 1.7.0† |