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

[1.9.x] connect: update supported envoy versions to 1.16.3, 1.15.4, 1.14.7, 1.13.7 (#10105)

This commit is contained in:
R.B. Boyer 2021-04-29 15:49:16 -05:00 committed by GitHub
parent c6905c0b39
commit ee30a54c7f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
28 changed files with 43 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10105.txt Normal file
View File

@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.16.3, 1.15.4, 1.14.7, 1.13.7
```

18
.circleci/config.yml
View File

@ -783,20 +783,20 @@ jobs:
path: *TEST_RESULTS_DIR
- run: *notify-slack-failure
envoy-integration-test-1_14_6:
envoy-integration-test-1_14_7:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.14.6"
ENVOY_VERSION: "1.14.7"
envoy-integration-test-1_15_3:
envoy-integration-test-1_15_4:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.15.3"
ENVOY_VERSION: "1.15.4"
envoy-integration-test-1_16_2:
envoy-integration-test-1_16_3:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.16.2"
ENVOY_VERSION: "1.16.3"
# run integration tests for the connect ca providers
test-connect-ca-providers:
@ -935,13 +935,13 @@ workflows:
- envoy-integration-test-1_13_7:
requires:
- dev-build
- envoy-integration-test-1_14_6:
- envoy-integration-test-1_14_7:
requires:
- dev-build
- envoy-integration-test-1_15_3:
- envoy-integration-test-1_15_4:
requires:
- dev-build
- envoy-integration-test-1_16_2:
- envoy-integration-test-1_16_3:
requires:
- dev-build
website:

10
agent/xds/envoy_versioning_test.go
View File

@ -5,9 +5,11 @@ import (
envoycore "github.com/envoyproxy/go-control-plane/envoy/api/v2/core"
envoytype "github.com/envoyproxy/go-control-plane/envoy/type"
"github.com/hashicorp/consul/sdk/testutil"
"github.com/hashicorp/go-version"
"github.com/stretchr/testify/require"
"github.com/hashicorp/consul/sdk/testutil"
)
func TestDetermineEnvoyVersionFromNode(t *testing.T) {
@ -100,9 +102,9 @@ 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.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",
"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",
} {
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.2",
"1.15.3",
"1.16.3",
"1.15.4",
"1.14.6",
"1.13.7",
}

136
agent/xds/testdata/routes/terminating-gateway-lb-config.envoy-1-17-x.golden vendored
View File

@ -1,136 +0,0 @@
{
"versionInfo": "00000001",
"resources": [
{
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [
{
"name": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [
"*"
],
"routes": [
{
"match": {
"prefix": "/"
},
"route": {
"autoHostRewrite": true,
"cluster": "v1.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
}
}
]
}
],
"validateClusters": true
},
{
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [
{
"name": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [
"*"
],
"routes": [
{
"match": {
"prefix": "/"
},
"route": {
"autoHostRewrite": true,
"cluster": "v2.web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
}
}
]
}
],
"validateClusters": true
},
{
"@type": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"virtualHosts": [
{
"name": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"domains": [
"*"
],
"routes": [
{
"match": {
"prefix": "/"
},
"route": {
"autoHostRewrite": true,
"cluster": "web.default.dc1.internal.11111111-2222-3333-4444-555555555555.consul",
"hashPolicy": [
{
"cookie": {
"name": "chocolate-chip"
},
"terminal": true
},
{
"header": {
"headerName": "x-user-id"
}
},
{
"connectionProperties": {
"sourceIp": true
},
"terminal": true
}
]
}
}
]
}
],
"validateClusters": true
}
],
"typeUrl": "type.googleapis.com/envoy.config.route.v3.RouteConfiguration",
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"
"envoy_version": "1.16.3"
}
},
"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.2"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.3"}
export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then