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

4825 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Timo Reimann
e615e833bc Use go-spew to display diffs. 2017-04-26 11:35:30 +02:00
Diego de Oliveira
592a12dca2 Fix unsound behavior 
The IP-Per-Task feature changed the behavior for
clients without this configuration (using the task IP instead
of task hostname). This patch make the new behavior available
just for Mesos installation with IP-Per-Task enabled. It also
make it possible to force the use of task's hostname.
 2017-04-26 11:35:30 +02:00
Timo Reimann
97a3564945 Merge pull request #1497 from containous/re-exclude-dist-traefik-in-dockerignore 
Re-exclude /dist/traefik from .dockerignore.
 2017-04-26 10:34:20 +02:00
Timo Reimann
f1ee471b6b Re-exclude /dist/traefik from .dockerignore. 
Required for the 'image' Makefile target to succeed since it copies the
binary into the image.
 2017-04-26 10:01:43 +02:00
Timo Reimann
750fa22cff Merge pull request #1474 from containous/marathon-check-port-label-overwrite-earlier 
Check for explicitly defined Marathon port first.
 2017-04-26 03:21:33 +02:00
Timo Reimann
099d605aed Check for explicitly defined Marathon port first. 
Previously, we did the check too late resulting in the traefik.port
label not being effective.

The change comes with additional refactorings in production and tests.
 2017-04-25 23:18:30 +02:00
Timo Reimann
f1bc80ca12 Change getLabel signature to return bool instead of error. 
The comma ok idiom fits better.
 2017-04-25 23:18:30 +02:00
Timo Reimann
49a9aeb95f Merge pull request #1489 from containous/docker-move-test-providers-into-run-body 
Move Docker test provider instantiation into t.Run body.
 2017-04-25 15:30:37 +02:00
Timo Reimann
25abf8b8f8 Stop retrying unit tests on Travis. 2017-04-25 14:56:43 +02:00
Timo Reimann
962fb908c0 Pass through TESTDIRS env var to Docker build container. 2017-04-25 14:56:43 +02:00
Timo Reimann
b44aca64e3 Move Docker test provider instantiation into t.Run body. 2017-04-25 14:56:43 +02:00
Ludovic Fernandez
34b21b9374 Merge pull request #1482 from ldez/docs/github-template 
doc: enhance GitHub template.
 2017-04-25 12:10:10 +02:00
Fernandez Ludovic
972579e2a0 refactor(bugCmd): update issue template. 
- fix collides with imported package name.
 2017-04-25 11:14:31 +02:00
Fernandez Ludovic
ccff8a80f5 doc: enhance GitHub template. 
- add issue and PR guide.
- rewrite templates
 2017-04-25 11:14:31 +02:00
Ludovic Fernandez
4f2a2d573d Merge pull request #1486 from containous/fix-consul-catalog-flags 
Fix Consul catalog prefix flags
 2017-04-25 11:13:28 +02:00
Emile Vauge
af1d0a7dce
Fix Consul catalog prefix flags 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-25 10:51:03 +02:00
Vincent Demeester
37e40bc776 Merge pull request #1470 from vdemeester/update-dockerignore 
Update dockerignore to ignore dist and sites
 2017-04-25 09:55:24 +02:00
Vincent Demeester
d9fd412e0e Update dockerignore ignore dist and sites 
As of now, it does nothing (`/dist/` doesn't filter the dist folder)
and sending anything from `dist` doesn't make sense as it's mounted
anyway.

Removing the traefik binary from whitelist as the integration script
compiles the binary before running, so we don't need to send it via
the build context.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-25 09:02:07 +02:00
Emile Vauge
4bc2f17b08 Merge pull request #1368 from containous/update-doc 
License 2017, Træfɪk => Træfik
 2017-04-24 16:20:55 +02:00
Emile Vauge
d1b65adfb1
Traefik logo license 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-24 15:34:12 +02:00
Emile Vauge
19a7d22eef
License 2017, Træfɪk => Træfik 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-24 15:12:44 +02:00
Vincent Demeester
6012a0f3c5 Merge pull request #1437 from ldez/feat/backends-filter 
feat(webui): Dashboard filter
 2017-04-24 10:25:46 +02:00
Fernandez Ludovic
4e81d41d06 doc: update web ui documentation 
- update web ui dev documentation
- update Dashboard screenshot.
 2017-04-24 10:04:58 +02:00
Fernandez Ludovic
f4579e5f12 refactor: clean code 
- remove dead code
- replace Fprintf by Fprint.
 2017-04-24 10:04:57 +02:00
Fernandez Ludovic
a8cbe7ef5e feat(webui): Add dashboard filter. 
- Convert Object properties to and array for backends and frondends for each providers.
- Remove unused parameters.
- Add filter.
 2017-04-24 10:04:57 +02:00
Timo Reimann
6ba17847ab Merge pull request #1179 from gstackio/master 
Fix error in documentation for Docker labels
 2017-04-23 02:30:53 +02:00
Benjamin Gandon
378a34c454 Fix error in documentation for Docker labels 2017-04-23 01:58:26 +02:00