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

Backport of Explicitly enable WebSocket upgrades into release/1.16.x #18211

Merged
merged 3 commits into from
Jul 20, 2023
Merged

Backport of Explicitly enable WebSocket upgrades into release/1.16.x #18211

merged 3 commits into from
Jul 20, 2023

Conversation

hc-github-team-consul-core
Copy link
Contributor

Backport

This PR is auto-generated from #18150 to be assessed for backporting due to the inclusion of the label backport/1.16.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@blake
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.

Description

Explicitly enable WebSocket connection upgrades in Envoy's HTTP connection manager. This is required to enable mesh applications configured with the http protocol to receive WebSocket connection upgrade requests from HTTP clients.

Links

Resolves #8283.

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern
Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/blake/enable-websocket-connection-upgrades/sincerely-stable-serval branch from edbfe8e to 26791bb Compare July 20, 2023 20:25
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/blake/enable-websocket-connection-upgrades/sincerely-stable-serval branch 2 times, most recently from 7b2cbce to 26791bb Compare July 20, 2023 20:25
github-team-consul-core-pr-approver
github-team-consul-core-pr-approver approved these changes Jul 20, 2023
View reviewed changes
Copy link

Choose a reason for hiding this comment

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

Auto approved Consul Bot automated PR

@github-actions github-actions bot added type/docs Documentation needs to be created/updated/clarified theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/ui Anything related to the UI theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies type/ci Relating to continuous integration (CI) tooling for testing or releases pr/dependencies PR specifically updates dependencies of project theme/envoy/xds Related to Envoy support theme/contributing Additions and enhancements to community contributing materials labels Jul 20, 2023
@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 20, 2023 20:27 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 20, 2023 20:30 Inactive
@blake
Explicitly enable WebSocket upgrades
50c3fa1 
This PR explicitly enables WebSocket upgrades in Envoy's UpgradeConfig for all
proxy types. (API Gateway, Ingress, and Sidecar.)

Fixes #8283
@blake
Add changelog
9e0241d
@blake blake force-pushed the backport/blake/enable-websocket-connection-upgrades/sincerely-stable-serval branch from 26791bb to 9e0241d Compare July 20, 2023 21:02
@blake blake marked this pull request as ready for review July 20, 2023 21:21
@blake blake merged commit dd7b578 into release/1.16.x Jul 20, 2023
106 checks passed
@blake blake deleted the backport/blake/enable-websocket-connection-upgrades/sincerely-stable-serval branch July 20, 2023 21:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver github-team-consul-core-pr-approver approved these changes

@blake blake Awaiting requested review from blake

Assignees

@blake blake

Labels
pr/dependencies PR specifically updates dependencies of project theme/api Relating to the HTTP API interface theme/cli Flags and documentation for the CLI interface theme/config Relating to Consul Agent configuration, including reloading theme/connect Anything related to Consul Connect, Service Mesh, Side Car Proxies theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/ui Anything related to the UI type/ci Relating to continuous integration (CI) tooling for testing or releases type/docs Documentation needs to be created/updated/clarified
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@hc-github-team-consul-core @github-team-consul-core-pr-approver @blake