-
Notifications
You must be signed in to change notification settings - Fork 5.1k
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 proxy protocol #2004
Add proxy protocol #2004
Conversation
52fa627
to
3575057
Compare
@@ -1,11 +1,8 @@ | |||
FROM golang:1.8 | |||
FROM golang:1.9-alpine |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do we plan to merge this even when Go 1.9 is still beta? I'd be concerned about that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We think the go 1.9 final will be out way before the trafik 1.4 final is ready, and this feature is the most wanted feature ;) So all in all, we think it's a reasonable risk.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What gives you confidence the next Go release will be out way before Traefik 1.4? Go 1.9 is only at the first release candidate, and Traefik is going to ship its first within the next few days presumably.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@timoreimann the rc2 was released weeks ago, and the final release date was theoretically weeks ago, and also https://github.com/golang/go/milestone/49 ;)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
OK, missed that it's actually rc2 already.
I'm still not sure it's a good idea to merge this before Go 1.9 final is actually released. I have seen things break in subtle ways over at least the last two Go releases. I'd prefer to take the time after the code freeze to iron out potential problems.
4abd4cf
to
f0ceca2
Compare
server/configuration.go
Outdated
@@ -247,12 +247,18 @@ func (ep *EntryPoints) Set(value string) error { | |||
whiteListSourceRange = strings.Split(result["WhiteListSourceRange"], ",") | |||
} | |||
|
|||
proxyprotocol := false | |||
if len(result["ProxyProtocol"]) > 0 { | |||
proxyprotocol = strings.EqualFold(result["ProxyProtocol"], "enable") || strings.EqualFold(result["ProxyProtocol"], "on") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You check to see if proxyprotocol
is enable
or on
, but not true
based on your example in the toml?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, I just copied what was already done for Compress
flag. Added `true for both :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👼 Much ❤️ @emilevauge (squash)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM 👏 🎉
08eedac
to
d13de9d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
d13de9d
to
9587d78
Compare
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
Signed-off-by: Emile Vauge <emile@vauge.com>
9587d78
to
ce6762e
Compare
Description
This PR supersedes #1145 to add Proxy Protocol support. It is based on the initial work made by jrb.
it also bumps Golang to 1.9 (needed to add Proxy Protocol).
Fixes #384