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.13.6, 1.12.7, 1.11.2, 1.10.0 for 1.7.x #9000

Merged
merged 2 commits into from
Oct 22, 2020
Merged

connect: update supported envoy point releases to 1.13.6, 1.12.7, 1.11.2, 1.10.0 for 1.7.x #9000

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
9c66281
connect: update supported envoy point releases to 1.13.6, 1.12.7, 1.1…
rboyer Oct 21, 2020
124249b
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
3 changes: 3 additions & 0 deletions .changelog/9000.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 releases to 1.13.6, 1.12.7, 1.11.2, 1.10.0 for 1.7.x
```
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 @@ -646,18 +646,18 @@ jobs:
ENVOY_VERSIONS: "1.11.2"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.12.3:
envoy-integration-test-1.12.7:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.12.3"
ENVOY_VERSIONS: "1.12.7"
steps: *ENVOY_INTEGRATION_TEST_STEPS

envoy-integration-test-1.13.1:
envoy-integration-test-1.13.6:
docker:
- image: *GOLANG_IMAGE
environment:
ENVOY_VERSIONS: "1.13.1"
ENVOY_VERSIONS: "1.13.6"
steps: *ENVOY_INTEGRATION_TEST_STEPS

# run tests on vault ca provider integration tests
Expand Down Expand Up @@ -763,10 +763,10 @@ workflows:
- envoy-integration-test-1.11.2:
requires:
- dev-build
- envoy-integration-test-1.12.3:
- envoy-integration-test-1.12.7:
requires:
- dev-build
- envoy-integration-test-1.13.1:
- envoy-integration-test-1.13.6:
requires:
- dev-build
- vault-ca-provider:
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.13.1",
"1.12.3",
"1.13.6",
"1.12.7",
"1.11.2",
"1.10.0",
}
34 changes: 17 additions & 17 deletions command/connect/envoy/envoy_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ func TestGenerateConfig(t *testing.T) {
Flags: []string{"-proxy-id", "test-proxy"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -100,7 +100,7 @@ func TestGenerateConfig(t *testing.T) {
"-token", "c9a52720-bf6c-4aa6-b8bc-66881a5ade95"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -119,7 +119,7 @@ func TestGenerateConfig(t *testing.T) {
"CONSUL_HTTP_TOKEN=c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -141,7 +141,7 @@ func TestGenerateConfig(t *testing.T) {
"token.txt": "c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -163,7 +163,7 @@ func TestGenerateConfig(t *testing.T) {
"token.txt": "c9a52720-bf6c-4aa6-b8bc-66881a5ade95",
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -181,7 +181,7 @@ func TestGenerateConfig(t *testing.T) {
"-grpc-addr", "localhost:9999"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand All @@ -202,7 +202,7 @@ func TestGenerateConfig(t *testing.T) {
"CONSUL_GRPC_ADDR=localhost:9999",
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand All @@ -222,7 +222,7 @@ func TestGenerateConfig(t *testing.T) {
"-grpc-addr", "unix:///var/run/consul.sock"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentSocket: "/var/run/consul.sock",
Expand All @@ -237,7 +237,7 @@ func TestGenerateConfig(t *testing.T) {
Flags: []string{"-proxy-id", "test-proxy"},
GRPCPort: 9999,
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand All @@ -256,7 +256,7 @@ func TestGenerateConfig(t *testing.T) {
Flags: []string{"-proxy-id", "test-proxy", "-admin-access-log-path", "/some/path/access.log"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand All @@ -275,7 +275,7 @@ func TestGenerateConfig(t *testing.T) {
Flags: []string{"-proxy-id", "test-proxy", "-ca-file", "some/path"},
Env: []string{},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand All @@ -291,7 +291,7 @@ func TestGenerateConfig(t *testing.T) {
Flags: []string{"-proxy-id", "test-proxy", "-ca-file", "../../../test/ca/root.cer"},
Env: []string{"CONSUL_HTTP_SSL=1"},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
// Should resolve IP, note this might not resolve the same way
Expand Down Expand Up @@ -334,7 +334,7 @@ func TestGenerateConfig(t *testing.T) {
}`,
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand Down Expand Up @@ -367,7 +367,7 @@ func TestGenerateConfig(t *testing.T) {
}`,
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand Down Expand Up @@ -405,7 +405,7 @@ func TestGenerateConfig(t *testing.T) {
} , { "name": "fake_sink_2" }`,
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand All @@ -430,7 +430,7 @@ func TestGenerateConfig(t *testing.T) {
}`,
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
Expand Down Expand Up @@ -485,7 +485,7 @@ func TestGenerateConfig(t *testing.T) {
}`,
},
WantArgs: BootstrapTplArgs{
EnvoyVersion: "1.13.1",
EnvoyVersion: "1.13.6",
ProxyCluster: "test-proxy",
ProxyID: "test-proxy",
AgentAddress: "127.0.0.1",
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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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.13.1"
"envoy_version": "1.13.6"
}
},
"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 @@ -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.11.2 1.12.2 1.13.0"}
ENVOY_VERSIONS=${ENVOY_VERSIONS:-"1.10.0 1.11.2 1.12.7 1.13.6"}

if [ ! -z "$DEBUG" ] ; then
set -x
Expand Down
11 changes: 6 additions & 5 deletions 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 @@ -6,16 +6,17 @@ unset CDPATH

cd "$(dirname "$0")"

# MISSING: 1.14.0
# MISSING: 1.12.5
versions=(
1.14.3
1.14.2
1.14.1
1.13.6
1.13.4
1.13.5
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