luxolus
/
open-consul
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

connect: update supported envoy versions to 1.18.3, 1.17.3, 1.16.4, and 1.15.5 (#10231)

This commit is contained in:
R.B. Boyer 2021-05-12 14:06:06 -05:00 committed by GitHub
parent 8c477a05b5
commit 05b52a3d63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
30 changed files with 59 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.changelog/10231.txt Normal file
View File

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

36
.circleci/config.yml
View File

@ -767,14 +767,14 @@ jobs:
command: make test-coverage-ci command: make test-coverage-ci
- run: *notify-slack-failure - run: *notify-slack-failure
envoy-integration-test-1_15_4: &ENVOY_TESTS envoy-integration-test-1_15_5: &ENVOY_TESTS
docker: docker:
# We only really need bash and docker-compose which is installed on all # 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. # Circle images but pick Go since we have to pick one of them.
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
parallelism: 2 parallelism: 2
environment: environment:
ENVOY_VERSION: "1.15.4" ENVOY_VERSION: "1.15.5"
steps: &ENVOY_INTEGRATION_TEST_STEPS steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout - checkout
# Get go binary from workspace # Get go binary from workspace
@ -807,32 +807,32 @@ jobs:
path: *TEST_RESULTS_DIR path: *TEST_RESULTS_DIR
- run: *notify-slack-failure - run: *notify-slack-failure
envoy-integration-test-1_15_4-v2compat: envoy-integration-test-1_15_5-v2compat:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.15.4" ENVOY_VERSION: "1.15.5"
TEST_V2_XDS: "1" TEST_V2_XDS: "1"
envoy-integration-test-1_16_3: envoy-integration-test-1_16_4:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.16.3" ENVOY_VERSION: "1.16.4"
envoy-integration-test-1_16_3-v2compat: envoy-integration-test-1_16_4-v2compat:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.16.3" ENVOY_VERSION: "1.16.4"
TEST_V2_XDS: "1" TEST_V2_XDS: "1"
envoy-integration-test-1_17_2: envoy-integration-test-1_17_3:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.17.2" ENVOY_VERSION: "1.17.3"
envoy-integration-test-1_18_2: envoy-integration-test-1_18_3:
<<: *ENVOY_TESTS <<: *ENVOY_TESTS
environment: environment:
ENVOY_VERSION: "1.18.2" ENVOY_VERSION: "1.18.3"
# run integration tests for the connect ca providers # run integration tests for the connect ca providers
test-connect-ca-providers: test-connect-ca-providers:
@ -1054,22 +1054,22 @@ workflows:
- nomad-integration-0_8: - nomad-integration-0_8:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_15_4: - envoy-integration-test-1_15_5:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_15_4-v2compat: - envoy-integration-test-1_15_5-v2compat:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_16_3: - envoy-integration-test-1_16_4:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_16_3-v2compat: - envoy-integration-test-1_16_4-v2compat:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_17_2: - envoy-integration-test-1_17_3:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1_18_2: - envoy-integration-test-1_18_3:
requires: requires:
- dev-build - dev-build

8
agent/xds/envoy_versioning_test.go
View File

@ -110,7 +110,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
// Insert a bunch of valid versions. // Insert a bunch of valid versions.
for _, v := range []string{ for _, v := range []string{
"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.5",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{ cases[v] = testcase{expect: supportedProxyFeatures{
GatewaysNeedStubClusterWhenEmptyWithIncrementalXDS: true, GatewaysNeedStubClusterWhenEmptyWithIncrementalXDS: true,
@ -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.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4",
"1.17.0", "1.17.1", "1.17.2", "1.17.0", "1.17.1", "1.17.2", "1.17.3",
"1.18.0", "1.18.1", "1.18.2", "1.18.0", "1.18.1", "1.18.2", "1.18.3",
} { } {
cases[v] = testcase{expect: supportedProxyFeatures{}} cases[v] = testcase{expect: supportedProxyFeatures{}}
} }

12
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.2", "1.18.3",
"1.17.2", "1.17.3",
"1.16.3", "1.16.4",
"1.15.4", "1.15.5",
} }
var EnvoyVersionsV2 = []string{ var EnvoyVersionsV2 = []string{
"1.16.3", "1.16.4",
"1.15.4", "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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.18.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"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.2" "envoy_version": "1.18.3"
} }
}, },
"static_resources": { "static_resources": {

4
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.4"}" OLD_XDSV2_AWARE_CONSUL_VERSION="${OLD_XDSV2_AWARE_CONSUL_VERSION:-"${HASHICORP_DOCKER_PROXY}/library/consul:1.9.5"}"
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.2"} ENVOY_VERSION=${ENVOY_VERSION:-"1.18.3"}
export ENVOY_VERSION export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then

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). 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.2`. This is required so that the correct configuration can be generated. `1.18.3`. 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

@ -34,8 +34,8 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | -------------------------------- | | ------------------- | -------------------------------- |
| 1.10.x | 1.18.2, 1.17.2, 1.16.3, 1.15.4 | | 1.10.x | 1.18.3, 1.17.3, 1.16.4, 1.15.5 |
| 1.9.x | 1.16.3, 1.15.4, 1.14.7‡, 1.13.7‡ | | 1.9.x | 1.16.4, 1.15.5, 1.14.7‡, 1.13.7‡ |
| 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\* | | 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.6.x, 1.5.3, 1.5.2 | 1.11.1, 1.10.0, 1.9.1, 1.8.0† |