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

[1.9.x] connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7 (#10232)

Browse Source 
manual backport of #10231 to 1.9.x
This commit is contained in:
R.B. Boyer 2021-05-12 14:26:56 -05:00 committed by GitHub
parent ff6d4c75b4
commit a179607457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 36 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10232.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7
```

12
.circleci/config.yml
View File

@ -788,15 +788,15 @@ jobs:
environment:
ENVOY_VERSION: "1.14.7"
envoy-integration-test-1_15_4:
envoy-integration-test-1_15_5:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.15.4"
ENVOY_VERSION: "1.15.5"
envoy-integration-test-1_16_3:
envoy-integration-test-1_16_4:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.16.3"
ENVOY_VERSION: "1.16.4"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@ -951,10 +951,10 @@ workflows:
- envoy-integration-test-1_14_7:
requires:
- dev-build
- envoy-integration-test-1_15_4:
- envoy-integration-test-1_15_5:
requires:
- dev-build
- envoy-integration-test-1_16_3:
- envoy-integration-test-1_16_4:
requires:
- dev-build
website:

4
agent/xds/envoy_versioning_test.go
View File

@ -103,8 +103,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
for _, v := range []string{
"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.14.7",
"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4",
"1.16.0", "1.16.1", "1.16.2", "1.16.3",
"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.5",
"1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}

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
var EnvoyVersions = []string{
"1.16.3",
"1.15.4",
"1.16.4",
"1.15.5",
"1.14.6",
"1.13.7",
}

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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"
"envoy_version": "1.16.4"
}
},
"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.3"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.4"}
export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then