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.

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

Add websockets support for vs/vsr upstreams #653

Merged
merged 2 commits into from
Aug 14, 2019

Conversation

Dean-Coakley
Copy link
Contributor

Proposed changes

This PR adds support for Websocket connections for upstreams without any additional configuration when configuring via VirtualServer or VirtualServerRoute.

Checklist

Before creating a PR, run through this checklist and mark each as complete.

  • I have read the CONTRIBUTING doc
  • I have checked that all unit tests pass after adding my changes
  • I have updated necessary documentation
  • I have rebased my branch onto master
  • I will ensure my PR is targeting the master branch and pulling from my branch from my own fork

@Dean-Coakley Dean-Coakley added the enhancement Pull requests for new features/feature enhancements label Aug 9, 2019
@Dean-Coakley Dean-Coakley self-assigned this Aug 9, 2019
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

Please see my comments

internal/configs/version2/nginx-plus.virtualserver.tmpl Outdated Show resolved Hide resolved
Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

@Dean-Coakley thx for the update. Please revert the changes done for the Ingress resources, as those are not required for this PR.

internal/configs/version1/nginx.ingress.tmpl Outdated Show resolved Hide resolved
internal/configs/version1/nginx-plus.tmpl Outdated Show resolved Hide resolved
Copy link
Contributor

@LorcanMcVeigh LorcanMcVeigh left a comment

Choose a reason for hiding this comment

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

lgtm 👍

Copy link
Contributor

@Rulox Rulox left a comment

Choose a reason for hiding this comment

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

Lgtm

Maybe it makes sense that @tellet takes a look to the tests changes so she's aware? Adding her as a reviewer.

@Rulox Rulox requested a review from tellet August 13, 2019 11:42
Copy link
Contributor

@tellet tellet left a comment

Choose a reason for hiding this comment

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

@Dean-Coakley Could you please rebase onto master. There is a new test merged TestVSHealthCheckUpstreamOption. It should probably be updated too.

Copy link
Contributor

@pleshakov pleshakov left a comment

Choose a reason for hiding this comment

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

looks good! please see the comment about the variable name before merging

internal/configs/version1/nginx-plus.tmpl Outdated Show resolved Hide resolved
* Was testing for the presence of "proxy_set_header Connection"
* Now tests for the presence of "set $default_connection_header"

$default_connection_header is a custom variable that is used for
upgrading to the Websocket protocol when using vs/vsr upstreams
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement Pull requests for new features/feature enhancements
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants