Skip to content

Backport of Explicitly enable WebSocket upgrades into release/1.15.x#18210

Merged
blake merged 3 commits intorelease/1.15.xfrom
backport/blake/enable-websocket-connection-upgrades/carefully-many-marten
Jul 20, 2023
Merged

Backport of Explicitly enable WebSocket upgrades into release/1.15.x#18210
blake merged 3 commits intorelease/1.15.xfrom
backport/blake/enable-websocket-connection-upgrades/carefully-many-marten

Conversation

@hc-github-team-consul-core
Copy link
Collaborator

@hc-github-team-consul-core hc-github-team-consul-core commented Jul 20, 2023

Backport

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

🚨

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/carefully-many-marten branch 2 times, most recently from fc08634 to 0d77cc5 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/carefully-many-marten branch from 0d77cc5 to fc08634 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
Collaborator

@github-team-consul-core-pr-approver github-team-consul-core-pr-approver left a comment

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 theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication 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 theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/certificates Related to creating, distributing, and rotating certificates in Consul theme/agent-cache Agent Cache theme/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation labels Jul 20, 2023
@hc-github-team-consul-core
Copy link
Collaborator Author

hc-github-team-consul-core commented Jul 20, 2023

🤔 This PR has changes in the website/ directory but does not have a type/docs-cherrypick label. If the changes are for the next version, this can be ignored. If they are updates to current docs, attach the label to auto cherrypick to the stable-website branch after merging.

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 20, 2023 20:28 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 20, 2023 20:30 Inactive
blake added 3 commits July 20, 2023 14:17
@blake
Explicitly enable WebSocket upgrades
2faf12a 
This PR explicitly enables WebSocket upgrades in Envoy's UpgradeConfig for all
proxy types. (API Gateway, Ingress, and Sidecar.)

Fixes #8283
@blake
Add changelog
d1daa5a
@blake
Update golden files
9529d57
@blake blake force-pushed the backport/blake/enable-websocket-connection-upgrades/carefully-many-marten branch from fc08634 to 9529d57 Compare July 20, 2023 21:18
@blake blake marked this pull request as ready for review July 20, 2023 21:21
@blake blake merged commit 816e911 into release/1.15.x Jul 20, 2023
@blake blake deleted the backport/blake/enable-websocket-connection-upgrades/carefully-many-marten branch July 20, 2023 21:57
@atlassian atlassian bot mentioned this pull request Aug 28, 2023
Closed
@atlassian atlassian bot mentioned this pull request Dec 1, 2023
Closed
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/agent-cache Agent Cache theme/api Relating to the HTTP API interface theme/certificates Related to creating, distributing, and rotating certificates in Consul 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/consul-terraform-sync Relating to Consul Terraform Sync and Network Infrastructure Automation theme/contributing Additions and enhancements to community contributing materials theme/envoy/xds Related to Envoy support theme/internals Serf, Raft, SWIM, Lifeguard, Anti-Entropy, locking topics theme/tls Using TLS (Transport Layer Security) or mTLS (mutual TLS) to secure communication 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