status-im/consul
2
0
Fork 0
mirror of https://github.com/status-im/consul.git synced 2025-03-02 22:30:43 +00:00
Code Issues Projects Releases Wiki Activity

[1.8.x] connect: update supported envoy point releases to 1.14.6, 1.13.7, 1.12.7, 1.11.2 (#9739)

Browse Source 
selective backport of #9737
This commit is contained in:
R.B. Boyer 2021-02-10 13:11:51 -06:00 committed by GitHub
parent 415be133fa
commit 22640c9e87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 36 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/9739.txt Normal file
View File

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

12
.circleci/config.yml
View File

@ -694,18 +694,18 @@ jobs:
ENVOY_VERSION: "1.12.7" ENVOY_VERSION: "1.12.7"
steps: *ENVOY_INTEGRATION_TEST_STEPS steps: *ENVOY_INTEGRATION_TEST_STEPS
envoy-integration-test-1_13_6: envoy-integration-test-1_13_7:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSION: "1.13.6" ENVOY_VERSION: "1.13.7"
steps: *ENVOY_INTEGRATION_TEST_STEPS steps: *ENVOY_INTEGRATION_TEST_STEPS
envoy-integration-test-1_14_5: envoy-integration-test-1_14_6:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSION: "1.14.5" ENVOY_VERSION: "1.14.6"
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
@ -846,10 +846,10 @@ workflows:
- envoy-integration-test-1_12_7: - envoy-integration-test-1_12_7:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_13_6: - envoy-integration-test-1_13_7:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_14_5: - envoy-integration-test-1_14_6:
requires: requires:
- dev-build - dev-build
website: website:

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

@ -7,8 +7,8 @@ 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.14.5", "1.14.6",
"1.13.6", "1.13.7",
"1.12.7", "1.12.7",
"1.11.2", "1.11.2",
} }

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

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

@ -6,7 +6,7 @@ set -eEuo pipefail
DEBUG=${DEBUG:-} DEBUG=${DEBUG:-}
# ENVOY_VERSION to run each test against # ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.14.5"} ENVOY_VERSION=${ENVOY_VERSION:-"1.14.6"}
export ENVOY_VERSION export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then

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

@ -9,11 +9,13 @@ cd "$(dirname "$0")"
# MISSING: 1.14.0 # MISSING: 1.14.0
# MISSING: 1.13.5 # MISSING: 1.13.5
versions=( versions=(
1.14.6
1.14.5 1.14.5
1.14.4 1.14.4
1.14.3 1.14.3
1.14.2 1.14.2
1.14.1 1.14.1
1.13.7
1.13.6 1.13.6
1.13.4 1.13.4
1.13.3 1.13.3
@ -31,7 +33,6 @@ versions=(
1.11.2 1.11.2
1.11.1 1.11.1
1.11.0 1.11.0
1.10.0
) )
for v in "${versions[@]}"; do for v in "${versions[@]}"; do