fix(nginx): Enable builder PROXY PROTOCOL support#263
Merged
mboersma merged 1 commit intodeis:masterfrom Sep 27, 2016
Merged
Conversation
If proxy protocol is enabled on an AWS ELB in kubernetes using the `service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'` annotation on the load balancer service, it will enable PROXY PROTOCOL on all ports forwarded by the ELB, which means the builder proxy on port 2222 also needs to use enable proxy_protocol on its listen directive. There is currently no way to configure PROXY PROTOCOL per port on AWS using kubenetes service annotation and it doesn't really make sense to enable proxy protocol only for port 80 and 443 anyways, so this fix uses the same configuration setting as is used for http and https. This fixes deis#255.
|
Thanks for the contribution! Please ensure your commits follow our style guide. This code will be tested once a Deis maintainer reviews it. |
|
@krancour, @kmala and @robholland are potential reviewers of this pull request based on my analysis of |
Current coverage is 46.40% (diff: 100%)@@ master #263 diff @@
==========================================
Files 3 3
Lines 306 306
Methods 0 0
Messages 0 0
Branches 0 0
==========================================
Hits 142 142
Misses 160 160
Partials 4 4
|
Member
|
Jenkins, add to whitelist. |
felixbuenemann
added a commit
to felixbuenemann/workflow
that referenced
this pull request
Sep 27, 2016
This adds a section on configuring PROXY protocol with a specific example targeting K8s on AWS using ELB. Because of the fix in deis/router#263 this PR should likely be held back until Workflow v2.6.0 is released.
felixbuenemann
added a commit
to felixbuenemann/workflow
that referenced
this pull request
Sep 28, 2016
This adds a section on configuring PROXY protocol with a specific example targeting K8s 1.3 on AWS using ELB. Because of the fix in deis/router#263 this PR should likely be held back until Workflow v2.6.0 is released.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
If proxy protocol is enabled on an AWS ELB in kubernetes using the
service.beta.kubernetes.io/aws-load-balancer-proxy-protocol: '*'annotation on the load balancer service, it will enable PROXY PROTOCOL
on all ports forwarded by the ELB, which means the builder proxy on port
2222 also needs to use
proxy_protocolon itslistendirective.There is currently no way to configure PROXY PROTOCOL per port on AWS
using kubenetes service annotation and it doesn't really make sense to
enable proxy protocol only for port 80 and 443 anyways, so this fix uses
the same configuration setting as is used for http and https.
The required
proxy_protocoloption for thelistendirective was added in NGINX 1.11.4.This fixes #255.