baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions
1952 commits 1 branch 0 tags 84 MiB
Commit graph

1952 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ludovic Fernandez
a5384bae47 Merge pull request #1540 from containous/marathon-add-tests-lost-during-1320-rebase 
Add tests lost during PR 1320.
 2017-05-03 17:15:10 +02:00
Timo Reimann
1dcf8d2ea6 Add tests lost during PR 1320. 
The tests part of this change were originally in PR 1320 but got lost
during one of the rebases. Let's bring them back in.
 2017-05-03 16:27:21 +02:00
Ludovic Fernandez
e86df016c3 Merge pull request #1537 from ldez/refactor-git-alias-safe 
refactor: fix for PR with master branch.
 2017-05-03 16:24:38 +02:00
Fernandez Ludovic
72baf746f4 refactor: fix for PR with master branch. 2017-05-03 15:54:43 +02:00
Ludovic Fernandez
91b4b47f04 Merge pull request #1523 from tanyadegurechaff/make-port-deterministic 
Make port deterministic
 2017-05-03 15:53:46 +02:00
tanyadegurechaff
79cbe56a41 Make port deterministic 2017-05-03 15:28:53 +02:00
Ludovic Fernandez
f621d7a2c4 Merge pull request #1525 from guilhem/fix-watchdog 
Fix systemd watchdog feature
 2017-05-03 15:25:15 +02:00
Guilhem Lettron
3c33eab35e Fix systemd watchdog feature 
Commit coreos/go-systemd@0c088e introduce cleaning environment.
First usage of sdnotify (for type=notify) was clearing NOTIFY_SOCKET environment variable.
sdnotify in watchdog was unable to ping back.

Fix #1353
 2017-05-03 14:44:51 +02:00
Ludovic Fernandez
b67a27d0c7 Merge pull request #1527 from yyekhlef/master 
feat(rancher): added constraint management for rancher provider
 2017-05-03 14:32:01 +02:00
Youcef Yekhlef
8de107866f feat(rancher): added constraint management for rancher provider 2017-05-03 13:48:44 +02:00
Ludovic Fernandez
b5283391dd Merge pull request #1488 from alpe/k8s-auth 
Add basic auth to kubernetes provider
 2017-05-03 13:37:05 +02:00
Fernandez Ludovic
420a6db3b4 doc: add k8s basic auth. 2017-05-03 13:18:40 +02:00
Alex Peters
89da3b15a4 Add basic auth to kubernetes provider 2017-05-03 13:18:40 +02:00
Emile Vauge
dcc4d92983 Merge pull request #1524 from jangie/update-dep-go-marathon 
[Marathon] Bump go-marathon dep
 2017-05-03 13:06:36 +02:00
Bruce Lee
12c2d398a7 retry using 'script/glide.sh update' 
fix docker dependency

remove unneeded docker dependency files

further cleanup
 2017-05-03 11:43:37 +02:00
jangie
4e238280bc [Marathon] Bump go-marathon dep 
attempt to remove glide from integration

glide trim

Revert "attempt to remove glide from integration"

This reverts commit c5b42b6cdebb44e730080a0cf20a871c11ef095b.
 2017-05-03 11:43:37 +02:00
Ludovic Fernandez
bd6056c269 Merge pull request #1534 from containous/revert-1464-vendor-autogen 
Revert "Vendor generated file"
 2017-05-03 10:40:38 +02:00
Fernandez Ludovic
acb0492e26 Merge pull request #1464 from vdemeester/vendor-autogen 2017-05-03 10:02:14 +02:00
Emile Vauge
a0d6594e99 Merge pull request #1464 from vdemeester/vendor-autogen 
Vendor generated file
 2017-05-01 19:07:15 +02:00
Vincent Demeester
65f81990a7
Update script to use /usr/bin/env bash… 
… instead of /bin/bash, to work better on more platforms.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-01 18:32:40 +02:00
Vincent Demeester
1b85dd0455
Vendor generated file 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-01 18:32:40 +02:00
Emile Vauge
bec45bc7d6 Merge pull request #1516 from ldez/refactor/documentation-review 
doc: small documentation review
 2017-05-01 18:32:20 +02:00
Fernandez Ludovic
4c4b05d024 refactor: small documentation review 2017-05-01 18:09:22 +02:00
Ludovic Fernandez
228ad9a244 Merge pull request #1517 from gottwald/safe-tests 
Add unit tests for package safe
 2017-05-01 17:33:16 +02:00
Ingo Gottwald
2f06f339ec
Add unit tests for package safe 
Also fix a bug in the code found due to the tests.
 2017-05-01 16:21:26 +02:00
Emile Vauge
eefcf026d2 Merge pull request #1515 from ldez/github-template-again 
doc: enhance Github templates.
 2017-05-01 16:08:14 +02:00
Fernandez Ludovic
ccb1a4ff8c
doc: enhance Github templates. 
- suppress the mini user guide.
- explain the 'traefik bug' command.
 2017-05-01 15:35:57 +02:00
Emile Vauge
78f1b4216e Merge pull request #1343 from uqf/improve-rancher-provider 
Improve rancher provider handling of service and container health states
 2017-05-01 12:34:59 +02:00
Matthew Kelch
44db6e9290 mprove Rancher provider functionality: 
- Improves default filtering behavior to filter by container health/healthState
- Optionally allows filtering by service health/healthState
- Allows configuration of refresh interval
 2017-04-29 15:37:54 -04:00
Timo Reimann
e2fdc27d64 Merge pull request #1338 from containous/add-global-option-for-healthcheck-interval 
Add global health check interval parameter.
 2017-04-28 21:35:29 +02:00
Timo Reimann
25345427c3 Add global health check interval parameter. 
The new parameter allows to set a health check interval valid for all
backends. Custom values set per provider may override the global one.
 2017-04-28 20:51:29 +02:00
Timo Reimann
ce492895e2 Merge pull request #1320 from containous/configure-healthcheck-via-marathon-label 
Make Traefik health checks label-configurable with Marathon.
 2017-04-28 18:59:35 +02:00
Timo Reimann
5d43b9e16a Add HealthCheckSuite to list of integration tests. 2017-04-28 18:17:25 +02:00
Timo Reimann
71a2c8bdcd Fix health check integration test suite typo. 2017-04-28 18:17:25 +02:00
Timo Reimann
8fd6160758 Fix health check path key name in Marathon template. 2017-04-28 18:17:25 +02:00
Timo Reimann
d57f83c31c Make Traefik health checks label-configurable with Marathon. 
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.
 2017-04-28 18:17:25 +02:00
Ludovic Fernandez
441d5442a1 Merge pull request #1339 from seguins/928-fix-regex-pathstrip 
Fix regex with PathStrip
 2017-04-28 18:01:05 +02:00
Stéphane Seguin
bf3673879f Fix regex with PathStrip 2017-04-28 17:33:14 +02:00
Ludovic Fernandez
74925ba996 Merge pull request #1357 from tcolgate/libkvuname 
Add libkv Username and Password
 2017-04-28 16:51:41 +02:00
Tristan Colgate
de6d771bc2 Add libkv Username and Password 2017-04-28 16:28:57 +02:00
Ludovic Fernandez
2f1a7cbf26 Merge pull request #1436 from Regner/1307-fix-k8s-tests-missing-endpoints 
Updating Kubernetes tests to properly test missing endpoints code path
 2017-04-28 15:54:33 +02:00
Regner Blok-Andersen
d24ba90900 Updating Kubernetes tests to properly test missing endpoints code path 
This fixes #1307
 2017-04-28 15:25:03 +02:00
Ludovic Fernandez
9ed55e9eae Merge pull request #1337 from SantoDE/fix/rancher_docs 
make docs more clear about how to work with the current api
 2017-04-28 10:40:29 +02:00
Manuel Laufenberg
a0c3d6a421 make docs more clear about how to work with the current api 2017-04-28 10:21:18 +02:00
Ludovic Fernandez
521e295349 Merge pull request #1374 from ssttevee/path-replace-rule 
Add Path Replacement Rule
 2017-04-27 10:38:41 +02:00
ssttevee
aa8375e82b added path replacement rule 2017-04-26 23:33:32 -07:00
Timo Reimann
5a8215a1e4 Merge pull request #1345 from diegooliveira/IP-Per-Task-Fix-Hostname 
[Marathon] Detect proper hostname automatically.
 2017-04-26 12:14:01 +02:00
Timo Reimann
7eb3051a57 Improve and extend TestGetBackendServer. 
- Cover error cases.
- Use sub-tests.
 2017-04-26 11:35:30 +02:00
Timo Reimann
a4355569af Extract index functionality into generic helper function. 
Allows to move specific test cases to dedicated tests for new function.
 2017-04-26 11:35:30 +02:00
Timo Reimann
16c86022bb Cosmetic changes. 2017-04-26 11:35:30 +02:00