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

Jump to bottom

Bump Envoy, remove support for unsupported versions #21616

Merged
merged 9 commits into from
Sep 12, 2024
Merged

Bump Envoy, remove support for unsupported versions #21616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
77e9703
bump envoy
sarahalsmiller Aug 19, 2024
e7376db
changelog
sarahalsmiller Aug 19, 2024
75c6e72
drop breaking change note
sarahalsmiller Aug 21, 2024
9bb4e11
update docs
sarahalsmiller Aug 29, 2024
dfce935
Merge branch 'main' into NET-10762-Bump-Envoy-to-1.30-and-1.31
sarahalsmiller Sep 11, 2024
ea181a2
Merge branch 'main' into NET-10762-Bump-Envoy-to-1.30-and-1.31
sarahalsmiller Sep 11, 2024
aefe6ef
udpate port tests
sarahalsmiller Sep 12, 2024
81434e9
Merge branch 'NET-10762-Bump-Envoy-to-1.30-and-1.31' of github.com:ha…
sarahalsmiller Sep 12, 2024
7a2b9e7
Merge branch 'main' into NET-10762-Bump-Envoy-to-1.30-and-1.31
sarahalsmiller Sep 12, 2024
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/21616.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
```release-note: improvement
connect: Add Envoy 1.31 and 1.30 to support matrix
```
6 changes: 3 additions & 3 deletions envoyextensions/xdscommon/ENVOY_VERSIONS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#
# See https://www.consul.io/docs/connect/proxies/envoy#supported-versions for more information on Consul's Envoy
# version support.
1.31.0
1.30.4
1.29.7
1.28.5
1.27.7
1.26.8
1.28.5
4 changes: 2 additions & 2 deletions test-integ/connect/snapshot_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) {
)
asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{
ID: staticServerSID,
LocalPort: 5000,
LocalPort: 8080,
})
staticServer := sp.Topology().Clusters["dc1"].WorkloadByID(
topology.NewNodeID("dc1-client1", "default"),
Expand Down Expand Up @@ -184,6 +184,6 @@ func Test_Snapshot_Restore_Agentless(t *testing.T) {
// Ensure the static-client connected to the new static-server
asserter.FortioFetch2HeaderEcho(t, staticClient, &topology.Upstream{
ID: staticServerSID,
LocalPort: 5000,
LocalPort: 8080,
})
}
1 change: 1 addition & 0 deletions website/content/docs/connect/proxies/envoy.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ apply to both Consul Enterprise and Consul community edition (CE).

| Consul Version | Compatible Envoy Versions |
| -------------- | -------------------------------------- |
| 1.20.x CE | 1.31.x, 1.30.x, 1.29.x, 1.28.x |
| 1.19.x CE | 1.29.x, 1.28.x, 1.27.x, 1.26.x |
| 1.18.x CE | 1.28.x, 1.27.x, 1.26.x, 1.25.x |
| 1.17.x | 1.27.x, 1.26.x, 1.25.x, 1.24.x |
Expand Down
Loading