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

add support for envoy 1.14.4, 1.13.4, 1.12.6 (#8216)

This commit is contained in:
Hans Hasselberg 2020-07-13 22:44:44 +02:00 committed by GitHub
parent b80cbb499f
commit 0c39b2c820
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 39 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.circleci/config.yml
View File

@ -581,25 +581,25 @@ jobs:
- store_artifacts: - store_artifacts:
path: *TEST_RESULTS_DIR path: *TEST_RESULTS_DIR
envoy-integration-test-1.12.4: envoy-integration-test-1.12.6:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSION: "1.12.4" ENVOY_VERSION: "1.12.6"
steps: *ENVOY_INTEGRATION_TEST_STEPS steps: *ENVOY_INTEGRATION_TEST_STEPS
envoy-integration-test-1.13.2: envoy-integration-test-1.13.4:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSION: "1.13.2" ENVOY_VERSION: "1.13.4"
steps: *ENVOY_INTEGRATION_TEST_STEPS steps: *ENVOY_INTEGRATION_TEST_STEPS
envoy-integration-test-1.14.2: envoy-integration-test-1.14.4:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
ENVOY_VERSION: "1.14.2" ENVOY_VERSION: "1.14.4"
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
@ -713,13 +713,13 @@ workflows:
- envoy-integration-test-1.11.2: - envoy-integration-test-1.11.2:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.12.4: - envoy-integration-test-1.12.6:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.13.2: - envoy-integration-test-1.13.4:
requires: requires:
- dev-build - dev-build
- envoy-integration-test-1.14.2: - envoy-integration-test-1.14.4:
requires: requires:
- dev-build - dev-build

6
agent/xds/clusters_test.go
View File

@ -742,8 +742,8 @@ func setupTLSRootsAndLeaf(t *testing.T, snap *proxycfg.ConfigSnapshot) {
// //
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions // see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var supportedEnvoyVersions = []string{ var supportedEnvoyVersions = []string{
"1.14.2", "1.14.4",
"1.13.2", "1.13.4",
"1.12.4", "1.12.6",
"1.11.2", "1.11.2",
} }

2
command/connect/envoy/envoy.go
View File

@ -69,7 +69,7 @@ type cmd struct {
} }
const ( const (
defaultEnvoyVersion = "1.14.2" defaultEnvoyVersion = "1.14.4"
meshGatewayVal = "mesh" meshGatewayVal = "mesh"
) )

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.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.4"
} }
}, },
"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.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.4"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/ingress-gateway-register-without-service-with-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.2" "envoy_version": "1.14.3"
} }
}, },
"static_resources": { "static_resources": {

2
command/connect/envoy/testdata/ingress-gateway-without-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.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.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.14.2" "envoy_version": "1.14.4"
} }
}, },
"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.2"} ENVOY_VERSION=${ENVOY_VERSION:-"1.14.4"}
export ENVOY_VERSION export ENVOY_VERSION
if [ ! -z "$DEBUG" ] ; then if [ ! -z "$DEBUG" ] ; then

2
website/pages/docs/commands/connect/envoy.mdx
View File

@ -76,7 +76,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.14.2`. This is required so that the correct configuration can be generated. `1.14.4`. This is required so that the correct configuration can be generated.
- `-- [pass-through options]` - Any options given after a double dash are passed - `-- [pass-through options]` - Any options given after a double dash are passed
directly through to the `envoy` invocation. See [Envoy's directly through to the `envoy` invocation. See [Envoy's

2
website/pages/docs/connect/proxies/envoy.mdx
View File

@ -35,7 +35,7 @@ compatible Envoy versions.
| Consul Version | Compatible Envoy Versions | | Consul Version | Compatible Envoy Versions |
| ------------------- | -------------------------------- | | ------------------- | -------------------------------- |
| 1.8.x | 1.14.2, 1.13.2, 1.12.4, 1.11.2 | | 1.8.x | 1.14.4, 1.13.4, 1.12.6, 1.11.2 |
| 1.7.x | 1.13.1, 1.12.3, 1.11.2, 1.10.0\* | | 1.7.x | 1.13.1, 1.12.3, 1.11.2, 1.10.0\* |
| 1.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0† | | 1.5.2, 1.5.3, 1.6.x | 1.11.1, 1.10.0, 1.9.1, 1.8.0† |
| 1.5.0, 1.5.1 | 1.9.1, 1.8.0† | | 1.5.0, 1.5.1 | 1.9.1, 1.8.0† |