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.

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 support for Envoy 1.19.1 #11115

Merged
merged 10 commits into from
Oct 4, 2021
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
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
3 changes: 3 additions & 0 deletions .changelog/11115.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.19.1, 1.18.4, 1.17.4, 1.16.5
```
8 changes: 8 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -859,6 +859,11 @@ jobs:
environment:
ENVOY_VERSION: "1.18.4"

envoy-integration-test-1_19_1:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.19.1"

# run integration tests for the connect ca providers
test-connect-ca-providers:
docker:
Expand Down Expand Up @@ -1117,6 +1122,9 @@ workflows:
- envoy-integration-test-1_18_4:
requires:
- dev-build
- envoy-integration-test-1_19_1:
requires:
- dev-build

website:
unless: << pipeline.parameters.trigger-load-test >>
Expand Down
1 change: 1 addition & 0 deletions agent/xds/envoy_versioning_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,7 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
"1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4", "1.16.5",
"1.17.0", "1.17.1", "1.17.2", "1.17.3", "1.17.4",
"1.18.0", "1.18.1", "1.18.2", "1.18.3", "1.18.4",
"1.19.0", "1.19.1",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
Expand Down
1 change: 1 addition & 0 deletions agent/xds/proxysupport/proxysupport.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ package proxysupport
//
// see: https://www.consul.io/docs/connect/proxies/envoy#supported-versions
var EnvoyVersions = []string{
"1.19.1",
"1.18.4",
"1.17.4",
"1.16.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/access-log-path.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/defaults.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
Copy link
Member

Choose a reason for hiding this comment

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

@eculver maybe afterwards you could knock this one out too: #11134

}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/existing-ca-file.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/existing-ca-path.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/extra_-multiple.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/extra_-single.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-env.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-flag.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/grpc-addr-unix.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/ingress-gateway.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/prometheus-metrics.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-arg.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-env.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-file-arg.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/token-file-env.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion command/connect/envoy/testdata/xds-addr-config.golden
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"metadata": {
"namespace": "default",
"partition": "default",
"envoy_version": "1.18.4"
"envoy_version": "1.19.1"
}
},
"static_resources": {
Expand Down
2 changes: 1 addition & 1 deletion test/integration/connect/envoy/run-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ TEST_V2_XDS=${TEST_V2_XDS:-}
export TEST_V2_XDS

# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.18.4"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.19.1"}
export ENVOY_VERSION

if [ ! -z "$DEBUG" ] ; then
Expand Down
1 change: 1 addition & 0 deletions website/content/docs/connect/proxies/envoy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ compatible Envoy versions.

| Consul Version | Compatible Envoy Versions |
| ------------------- | ------------------------------------------------------ |
| 1.11.x | 1.19.1, 1.18.4, 1.17.4, 1.16.5 |
| 1.10.x | 1.18.4, 1.17.4, 1.16.5, 1.15.5 |
| 1.9.x | 1.16.5, 1.15.5, 1.14.7<sup>1</sup>, 1.13.7<sup>1</sup> |
| 1.8.x | 1.14.7, 1.13.7, 1.12.7, 1.11.2 |
Expand Down