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

[1.9.x] connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7 #10232

Merged
merged 2 commits into from
May 12, 2021
Merged

[1.9.x] connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7 #10232

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
39b1382
connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, a…
rboyer May 12, 2021
ea7b41c
changelog
rboyer May 12, 2021
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/10232.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note:improvement
connect: update supported envoy versions to 1.16.4, 1.15.5, 1.14.6, and 1.13.7
```
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -788,15 +788,15 @@ jobs:
environment:
ENVOY_VERSION: "1.14.7"

envoy-integration-test-1_15_4:
envoy-integration-test-1_15_5:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.15.4"
ENVOY_VERSION: "1.15.5"

envoy-integration-test-1_16_3:
envoy-integration-test-1_16_4:
<<: *ENVOY_TESTS
environment:
ENVOY_VERSION: "1.16.3"
ENVOY_VERSION: "1.16.4"

# run integration tests for the connect ca providers
test-connect-ca-providers:
Expand Down Expand Up @@ -951,10 +951,10 @@ workflows:
- envoy-integration-test-1_14_7:
requires:
- dev-build
- envoy-integration-test-1_15_4:
- envoy-integration-test-1_15_5:
requires:
- dev-build
- envoy-integration-test-1_16_3:
- envoy-integration-test-1_16_4:
requires:
- dev-build
website:
Expand Down
4 changes: 2 additions & 2 deletions agent/xds/envoy_versioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,8 +103,8 @@ func TestDetermineSupportedProxyFeaturesFromString(t *testing.T) {
for _, v := range []string{
"1.13.1", "1.13.2", "1.13.3", "1.13.4", "1.13.6", "1.13.7",
"1.14.1", "1.14.2", "1.14.3", "1.14.4", "1.14.5", "1.14.6", "1.14.7",
"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4",
"1.16.0", "1.16.1", "1.16.2", "1.16.3",
"1.15.0", "1.15.1", "1.15.2", "1.15.3", "1.15.4", "1.15.5",
"1.16.0", "1.16.1", "1.16.2", "1.16.3", "1.16.4",
} {
cases[v] = testcase{expect: supportedProxyFeatures{}}
}
Expand Down
4 changes: 2 additions & 2 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.16.3",
"1.15.4",
"1.16.4",
"1.15.5",
"1.14.6",
"1.13.7",
}
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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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.16.3"
"envoy_version": "1.16.4"
}
},
"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 @@ -10,7 +10,7 @@ readonly HASHICORP_DOCKER_PROXY="docker.mirror.hashicorp.services"
DEBUG=${DEBUG:-}

# ENVOY_VERSION to run each test against
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.3"}
ENVOY_VERSION=${ENVOY_VERSION:-"1.16.4"}
export ENVOY_VERSION

if [ ! -z "$DEBUG" ] ; then
Expand Down