Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

connect: update supported envoy point releases to 1.14.5, 1.13.6, 1.12.7, 1.11.2 for 1.8.x #8999

Merged
merged 3 commits into from
Oct 22, 2020
Merged

connect: update supported envoy point releases to 1.14.5, 1.13.6, 1.12.7, 1.11.2 for 1.8.x #8999

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77b9663
connect: update supported envoy point releases to 1.14.5, 1.13.6, 1.1…
rboyer Oct 21, 2020
f76645c
update golden files
rboyer Oct 21, 2020
88964d5
update changelog
rboyer Oct 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -640,25 +640,25 @@ jobs:
- store_artifacts:
path: *TEST_RESULTS_DIR

envoy-integration-test-1.12.4:
envoy-integration-test-1.12.7:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSION: "1.12.4"
ENVOY_VERSION: "1.12.7"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.13.2:
envoy-integration-test-1.13.6:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSION: "1.13.2"
ENVOY_VERSION: "1.13.6"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.14.2:
envoy-integration-test-1.14.5:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSION: "1.14.2"
ENVOY_VERSION: "1.14.5"
steps: *ENVOY_INTEGRATION_TEST_STEPS

# run integration tests for the connect ca providers
Expand Down Expand Up @@ -774,13 +774,13 @@ workflows:
- envoy-integration-test-1.11.2:
requires:
- dev-build
- envoy-integration-test-1.12.4:
- envoy-integration-test-1.12.7:
requires:
- dev-build
- envoy-integration-test-1.13.2:
- envoy-integration-test-1.13.6:
requires:
- dev-build
- envoy-integration-test-1.14.2:
- envoy-integration-test-1.14.5:
requires:
- dev-build

Expand Down
6 changes: 3 additions & 3 deletions agent/xds/proxysupport/proxysupport.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.14.2",
"1.13.2",
"1.12.4",
"1.14.5",
"1.13.6",
"1.12.7",
"1.11.2",
}
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/CONSUL_HTTP_ADDR-with-https-scheme-enables-tls.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/access-log-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/defaults.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/existing-ca-file.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/existing-ca-path.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/extra_-multiple.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/extra_-single.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-flag.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-unix.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway-address-specified.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "ingress-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway-no-auto-register.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "ingress-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-and-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "my-gateway-123",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway-register-with-service-without-proxy-id.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "my-gateway",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "ingress-gateway-1",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/stats-config-override.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-arg.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-file-arg.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-file-env.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/zipkin-tracing-config.golden
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"id": "test-proxy",
"metadata": {
"namespace": "default",
"envoy_version": "1.14.2"
"envoy_version": "1.14.5"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set -eEuo pipefail
DEBUG=${DEBUG:-}

# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.14.2"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.14.5"}
export ENVOY_VERSION

if [ ! -z "$DEBUG" ] ; then
Expand Down
9 changes: 8 additions & 1 deletion test/integration/connect/envoy/test-envoy-versions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,22 @@ unset CDPATH
cd "$(dirname "$0")"

# MISSING: 1.14.0
# MISSING: 1.12.5
# MISSING: 1.13.5
versions=(
1.14.5
1.14.4
1.14.3
1.14.2
1.14.1
1.13.6
1.13.4
1.13.3
1.13.2
1.13.1
1.13.0
1.12.7
1.12.6
1.12.5
1.12.4
1.12.3
1.12.2
Expand Down
2 changes: 1 addition & 1 deletion website/pages/commands/connect/envoy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ proxy configuration needed.
allowed to access by [Connect intentions](/docs/connect/intentions).

- `-envoy-version` - The version of envoy that is being started. Default is
`1.14.4`. This is required so that the correct configuration can be generated.
`1.14.5`. This is required so that the correct configuration can be generated.
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I edited these website refs because it was simple, but it's dead code since we don't render these website chunks, nor keep them up to date.


- `-no-central-config` - By default the proxy's bootstrap configuration can be
customized centrally. This requires that the command run on the same agent
Expand Down
2 changes: 1 addition & 1 deletion website/pages/docs/connect/proxies/envoy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ compatible Envoy versions.

| Consul Version | Compatible Envoy Versions |
| ------------------- | -------------------------------- |
| 1.8.x | 1.14.4, 1.13.4, 1.12.6, 1.11.2 |
| 1.8.x | 1.14.5, 1.13.6, 1.12.7, 1.11.2 |
| 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.0, 1.5.1 | 1.9.1, 1.8.0† |
Expand Down