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

add envoy version 1.12.2 and 1.13.0 to the matrix #7240

Merged
merged 8 commits into from
Feb 10, 2020
Merged

add envoy version 1.12.2 and 1.13.0 to the matrix #7240

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
66cd15d
add 1.12.2
hanshasselberg Feb 7, 2020
42aeb2d
add envoy 1.13.0
hanshasselberg Feb 7, 2020
943af3a
Introduce -envoy-version to get 1.10.0 passing.
hanshasselberg Feb 10, 2020
4da1be6
update old version and fix consul-exec case
hanshasselberg Feb 10, 2020
d091e8d
add envoy_version and fix check
hanshasselberg Feb 10, 2020
7d4a267
better json
hanshasselberg Feb 10, 2020
3bbda9a
feedback
hanshasselberg Feb 10, 2020
e42d665
Update Envoy CLI tests to account for the 1.13 compatibility changes.
mkeeler Feb 10, 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
25 changes: 12 additions & 13 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,14 +509,13 @@ jobs:
- store_test_results:
path: ui-v2/test-results

# Envoy integration tests. Require docker dev binary to be built already
envoy-integration-test-1.8.0:
envoy-integration-test-1.10.0:
docker:
# 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.
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.8.0"
ENVOY_VERSIONS: "1.10.0"
steps: &ENVOY_INTEGRATION_TEST_STEPS
- checkout
# Get go binary from workspace
Expand All @@ -536,25 +535,25 @@ jobs:
path: ./test/integration/connect/envoy/workdir/logs
destination: container-logs

envoy-integration-test-1.9.1:
envoy-integration-test-1.11.2:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.9.1"
ENVOY_VERSIONS: "1.11.2"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.10.0:
envoy-integration-test-1.12.2:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.10.0"
ENVOY_VERSIONS: "1.12.2"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.11.1:
envoy-integration-test-1.13.0:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.11.1"
ENVOY_VERSIONS: "1.13.0"
steps: *ENVOY_INTEGRATION_TEST_STEPS

# run tests on vault ca provider integration tests
Expand Down Expand Up @@ -640,16 +639,16 @@ workflows:
- nomad-integration-0_8:
requires:
- dev-build
- envoy-integration-test-1.8.0:
- envoy-integration-test-1.10.0:
requires:
- dev-build
- envoy-integration-test-1.9.1:
- envoy-integration-test-1.11.2:
requires:
- dev-build
- envoy-integration-test-1.10.0:
- envoy-integration-test-1.12.2:
requires:
- dev-build
- envoy-integration-test-1.11.1:
- envoy-integration-test-1.13.0:
requires:
- dev-build
- vault-ca-provider:
Expand Down
16 changes: 16 additions & 0 deletions command/connect/envoy/bootstrap_tpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ type BootstrapTplArgs struct {
// Namespace is the Consul Enterprise Namespace of the proxy service instance as
// registered with the Consul agent.
Namespace string

EnvoyVersion string
}

const bootstrapTemplate = `{
Expand Down Expand Up @@ -190,6 +192,20 @@ const bootstrapTemplate = `{
}
}
}
{{- if ne .EnvoyVersion "1.10.0"}}
},
"layered_runtime":{
"layers": [
{
"name": "static_layer",
"static_layer": {
"envoy.deprecated_features:envoy.api.v2.Cluster.tls_context": true,
"envoy.deprecated_features:envoy.config.trace.v2.ZipkinConfig.HTTP_JSON_V1": true,
"envoy.deprecated_features:envoy.config.filter.network.http_connection_manager.v2.HttpConnectionManager.Tracing.operation_name": true
}
}
]
{{- end }}
}
}
`
5 changes: 5 additions & 0 deletions command/connect/envoy/envoy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ type cmd struct {
bootstrap bool
disableCentralConfig bool
grpcAddr string
envoyVersion string

// mesh gateway registration information
register bool
Expand Down Expand Up @@ -110,6 +111,9 @@ func (c *cmd) init() {
"Set the agent's gRPC address and port (in http(s)://host:port format). "+
"Alternatively, you can specify CONSUL_GRPC_ADDR in ENV.")

c.flags.StringVar(&c.envoyVersion, "envoy-version", "1.13.0",
"Sets the envoy-version that the envoy binary has.")

c.flags.BoolVar(&c.register, "register", false,
"Register a new Mesh Gateway service before configuring and starting Envoy")

Expand Down Expand Up @@ -519,6 +523,7 @@ func (c *cmd) templateArgs() (*BootstrapTplArgs, error) {
Token: httpCfg.Token,
LocalAgentClusterName: xds.LocalAgentClusterName,
Namespace: httpCfg.Namespace,
EnvoyVersion: c.envoyVersion,
}, nil
}

Expand Down
1 change: 1 addition & 0 deletions test/integration/connect/envoy/helpers.bash
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,6 +508,7 @@ function gen_envoy_bootstrap {

if output=$(docker_consul "$DC" connect envoy -bootstrap \
-proxy-id $PROXY_ID \
-envoy-version "$ENVOY_VERSION" \
-admin-bind 0.0.0.0:$ADMIN_PORT ${EXTRA_ENVOY_BS_ARGS} 2>&1); then

# All OK, write config to file
Expand Down
3 changes: 1 addition & 2 deletions test/integration/connect/envoy/run-tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ FILTER_TESTS=${FILTER_TESTS:-}
STOP_ON_FAIL=${STOP_ON_FAIL:-}

# ENVOY_VERSIONS is the list of envoy versions to run each test against
ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.9.1 1.8.0 1.11.2"}
ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.2 1.13.0"}

if [ ! -z "$DEBUG" ] ; then
set -x
Expand All @@ -27,7 +27,6 @@ DIR=$(cd -P -- "$(dirname -- "$0")" && pwd -P)

cd $DIR

FILTER_TESTS=${FILTER_TESTS:-}
LEAVE_CONSUL_UP=${LEAVE_CONSUL_UP:-}
PROXY_LOGS_ON_FAIL=${PROXY_LOGS_ON_FAIL:-}

Expand Down
3 changes: 2 additions & 1 deletion website/source/docs/connect/proxies/envoy.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ compatible Envoy versions.

| Consul Version | Compatible Envoy Versions |
|---|---|
| 1.5.2 and higher | 1.11.1 1.10.0, 1.9.1, 1.8.0† |
| 1.7.0 and higher | 1.12.2, 1.11.2, 1.10.0, 1.9.1 |
Copy link
Contributor

Choose a reason for hiding this comment

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

Just a note that maybe we should clarify in the changelog for 1.7.0 that we now require Envoy > 1.9.1.

Copy link
Member Author

Choose a reason for hiding this comment

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

👍

| 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.3.x, 1.4.x | 1.9.1, 1.8.0†, 1.7.0† |

Expand Down