Make Traefik health checks label-configurable with Marathon. #1320
Conversation
|
This PR builds upon the changes introduced by #1319. Thus, it is currently based on that branch and will be rebased onto master as soon as the dependent PR merges. |
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
3 times, most recently
from
4ce1619
to
279570e
Compare
timoreimann
force-pushed
the
start-healthcheck-early
branch
from
7c78105
to
24ed5ed
Compare
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
from
279570e
to
73f02f6
Compare
timoreimann
force-pushed
the
start-healthcheck-early
branch
2 times, most recently
from
cb54814
to
60ea919
Compare
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
from
73f02f6
to
031c82c
Compare
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
3 times, most recently
from
8e68623
to
9c62808
Compare
|
@timoreimann #1319 is merged, I think you can rebase on master now. |
|
@ldez already did a few days ago (forgot to comment). Latest merge conflicts are due to more recent PRs being merged. Will update the PR later. This shouldn't stop reviewing though. |
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
4 times, most recently
from
4d7f3d5
to
8a99789
Compare
There was a problem hiding this comment.
Can you activate the HealthCheckSuite ? https://github.com/containous/traefik/blob/master/integration/integration_test.go#L25-L40
ldez
added
contributor/waiting-for-corrections
and removed
contributor/waiting-for-corrections
labels
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
5 times, most recently
from
ed5a0d7
to
7f62c39
Compare
integration/healthcheck_test.go
Outdated
| @@ -17,15 +17,15 @@ import ( | |||
| ) | |||
|
|
|||
| // HealchCheck test suites (using libcompose) | |||
There was a problem hiding this comment.
Thanks for the note, done.
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
from
06d365d
to
db3e461
Compare
There was a problem hiding this comment.
Thanks @timoreimann
LGTM :)
You added 2 new labels in the Marathon provider that we should report in others providers later: https://github.com/containous/traefik/pull/1320/files#diff-ed1959fa6ceca7431deaf68202208463R29. Would you open a proposal in an issue to refactor and centralize labels/tags/annotations for all providers? This would simplify a lot the providers mechanism :)
ldez
added
status/3-needs-merge
and removed
contributor/needs-resolve-conflicts
status/2-needs-review
labels
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
2 times, most recently
from
d03ed9f
to
8023297
Compare
For the two existing health check parameters (path and interval), we add support for Marathon labels. Changes in detail: - Extend the Marathon provider and template. - Refactor Server.loadConfig to reduce duplication. - Refactor the healthcheck package slightly to accommodate the changes and allow extending by future parameters. - Update documentation.
timoreimann
force-pushed
the
configure-healthcheck-via-marathon-label
branch
from
8023297
to
5d43b9e
Compare
For the two existing health check parameters (path [formerly known as URL] and interval), we add support for Marathon labels.
Changes in detail:
Fixes #1232.