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

connect: update envoy supported versions to latest patch release 

(#10961)

Relevant advisory: 
https://github.com/envoyproxy/envoy/security/advisories/GHSA-6g4j-5vrw-2m8h
This commit is contained in:
Freddy 2021-08-31 10:39:18 -06:00 committed by GitHub
parent 1a45e96307
commit 8d83d27674
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
31 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10961.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.18.4, 1.17.4, 1.16.5
```

24
.circleci/config.yml
View File

@ -826,26 +826,26 @@ jobs:
ENVOY_VERSION: "1.15.5" ENVOY_VERSION: "1.15.5"
TEST_V2_XDS: "1" TEST_V2_XDS: "1"
envoy-integration-test-1_16_4: envoy-integration-test-1_16_5:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.16.4" ENVOY_VERSION: "1.16.5"
envoy-integration-test-1_16_4-v2compat: envoy-integration-test-1_16_5-v2compat:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.16.4" ENVOY_VERSION: "1.16.5"
TEST_V2_XDS: "1" TEST_V2_XDS: "1"
envoy-integration-test-1_17_3: envoy-integration-test-1_17_4:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.17.3" ENVOY_VERSION: "1.17.4"
envoy-integration-test-1_18_3: envoy-integration-test-1_18_4:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.18.3" ENVOY_VERSION: "1.18.4"
# run integration tests for the connect ca providers # run integration tests for the connect ca providers
test-connect-ca-providers: test-connect-ca-providers:
@ -1093,16 +1093,16 @@ workflows:
- envoy-integration-test-1_15_5-v2compat: - envoy-integration-test-1_15_5-v2compat:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_16_4: - envoy-integration-test-1_16_5:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_16_4-v2compat: - envoy-integration-test-1_16_5-v2compat:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_17_3: - envoy-integration-test-1_17_4:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_18_3: - envoy-integration-test-1_18_4:
requires: requires:
- dev-build - dev-build

6
agent/xds/envoy_versioning_test.go
View File

@ -118,9 +118,9 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
}} }}
} }
for _, v := range []string{ for _, v := range []string{
"1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5",
"1.17.0", "1.17.1", "1.17.2", "1.17.3", "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.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

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

@ -7,13 +7,13 @@ package proxysupport
// //
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{ var EnvoyVersions = []string{
"1.18.3", "1.18.4",
"1.17.3", "1.17.4",
"1.16.4", "1.16.5",
"1.15.5", "1.15.5",
} }
var EnvoyVersionsV2 = []string{ var EnvoyVersionsV2 = []string{
"1.16.4", "1.16.5",
"1.15.5", "1.15.5",
} }

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

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

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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/deprecated-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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

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

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

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

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

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

@ -13,7 +13,7 @@
"id": "ingress-gateway", "id": "ingress-gateway",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "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", "id": "my-gateway-123",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "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", "id": "my-gateway",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

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

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

2
command/connect/envoy/testdata/prometheus-metrics.golden vendored
View File

@ -13,7 +13,7 @@
"id": "test-proxy", "id": "test-proxy",
"metadata": { "metadata": {
"namespace": "default", "namespace": "default",
"envoy_version": "1.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/xds-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.18.3" "envoy_version": "1.18.4"
} }
}, },
"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.18.3" "envoy_version": "1.18.4"
} }
}, },
"static_resources": { "static_resources": {

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

@ -9,7 +9,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
# DEBUG=1 enables set -x for this script so echos every command run # DEBUG=1 enables set -x for this script so echos every command run
DEBUG=${DEBUG:-} DEBUG=${DEBUG:-}
OLD_XDSV2_AWARE_CONSUL_VERSION="${OLD_XDSV2_AWARE_CONSUL_VERSION:-"${HASHICORP_DOCKER_PROXY}/library/consul:1.9.5"}" OLD_XDSV2_AWARE_CONSUL_VERSION="${OLD_XDSV2_AWARE_CONSUL_VERSION:-"${HASHICORP_DOCKER_PROXY}/library/consul:1.9.8"}"
export OLD_XDSV2_AWARE_CONSUL_VERSION export OLD_XDSV2_AWARE_CONSUL_VERSION
# TEST_V2_XDS=1 causes it to do just the 'consul connect envoy' part using # TEST_V2_XDS=1 causes it to do just the 'consul connect envoy' part using
@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-}
export TEST_V2_XDS export TEST_V2_XDS
# ENVOY_VERSION to run each test against # ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.18.3"} ENVOY_VERSION=${ENVOY_VERSION:-"1.18.4"}
export ENVOY_VERSION export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then
@ -27,7 +27,7 @@ fi
if [[ -n "$TEST_V2_XDS" ]] ; then if [[ -n "$TEST_V2_XDS" ]] ; then
if [[ ! "${ENVOY_VERSION}" =~ ^1\.1[456]\. ]]; then if [[ ! "${ENVOY_VERSION}" =~ ^1\.1[456]\. ]]; then
echo "Envoy version ${ENVOY_VERSION} is not compatible with Consul 1.9.1 so we cannot test the xDS v2 fallback code" echo "Envoy version ${ENVOY_VERSION} is not compatible with Consul 1.9.8 so we cannot test the xDS v2 fallback code"
exit 1 exit 1
fi fi
fi fi

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

@ -75,7 +75,7 @@ proxy configuration needed.
allowed to access by [Connect intentions](/docs/connect/intentions). allowed to access by [Connect intentions](/docs/connect/intentions).
- `-envoy-version` - The version of envoy that is being started. Default is - `-envoy-version` - The version of envoy that is being started. Default is
`1.18.3`. This is required so that the correct configuration can be generated. `1.18.4`. This is required so that the correct configuration can be generated.
- `-no-central-config` - By default the proxy's bootstrap configuration can be - `-no-central-config` - By default the proxy's bootstrap configuration can be
customized centrally. This requires that the command run on the same agent customized centrally. This requires that the command run on the same agent

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

@ -35,8 +35,8 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ | | ------------------- | ------------------------------------------------------ |
| 1.10.x | 1.18.3, 1.17.3, 1.16.4, 1.15.5 | | 1.10.x | 1.18.4, 1.17.4, 1.16.5, 1.15.5 |
| 1.9.x | 1.16.4, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> | | 1.9.x | 1.16.5, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> |
| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 | | 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |
| 1.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0<sup>2</sup> | | 1.7.x | 1.13.7, 1.12.7, 1.11.2, 1.10.0<sup>2</sup> |
| 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0<sup>3</sup> | | 1.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0<sup>3</sup> |