Add basic compatibility with marathon-lb #720
Merged
Conversation
This file contains 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
|
/cc @containous/traefik |
|
I hope this to be merged in 1.1 👼 |
emilevauge
reviewed
Oct 7, 2016
There was a problem hiding this comment.
@guilhem thanks for your contribution!
Could you add a unit test for this use case?
Add compatibility with labels: `HAPROXY_GROUP` and `HAPROXY_0_VHOST`. * `HAPROXY_GROUP` become a new tag * `HAPROXY_0_VHOST` become a rule `Host:` https://github.com/mesosphere/marathon-lb
|
@emilevauge done :) |
emilevauge
reviewed
Oct 10, 2016
| }, | ||
| }, | ||
| marathonLBCompatibility: true, | ||
| expected: "Host:foo.bar", |
There was a problem hiding this comment.
Not sure to understand here 🤔
I was expecting expected: "Host:notvalid" instead, reading the code in getFrontendRule. Am I missing something?
There was a problem hiding this comment.
if traefik.frontend.rule is present there is a return before trying HAPROXY label.
I prefer this behavior with traefik labels superseding other one.
|
@guilhem needs rebase on v1.1 branch :) |
|
@emilevauge done :) |
|
I think you can squash with 1 button (to remove "merge" commit) |
emilevauge
approved these changes
Oct 12, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Add compatibility with labels:
HAPROXY_GROUPandHAPROXY_0_VHOST.HAPROXY_GROUPbecome a new tagHAPROXY_0_VHOSTbecome a ruleHost:https://github.com/mesosphere/marathon-lb