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

241 commits

Author SHA1 Message Date
Luke Petre
8d3c77a0b9 Add an ECS provider 2017-02-05 18:09:30 +00:00
Stefan Scherer
434596b103 Fix Docker API version for Windows 
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
 2017-02-04 16:44:10 +01:00
Diego de Oliveira
cbbb5f4ccb Fix marathon provider 
The IP-Per-Task PR introduced a bug using the marathon application
port mapping. This port should be used only in the proxy server, the
downstream connection should be always made with the task port.

    This commit fix the regression and adds a unit test to prevent new
problems in this setup.
 2017-02-04 16:05:35 +01:00
Brian Akins
225dbcce0a Allow setting circuitbreaker expression via Kubernetes annotation (#1056) 2017-02-03 17:47:48 +01:00
Bruce Lee
ad12a7264e Ensure that we don't add balancees with no health check runs if there is a health check defined on it 
Change test behavior
 2017-02-03 08:45:15 -05:00
Emile Vauge
54be6beaab
Lint files 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:55:47 +01:00
Emile Vauge
5a67d0ac84
Fix panic in k8s loadIngresses 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-03 09:46:27 +01:00
Emile Vauge
be362f0d9f
Add Operation with recover 2017-02-03 09:46:27 +01:00
Brian Akins
490427f94d
Allow setting load balancer method and sticky using service annotations 2017-02-02 14:03:39 +00:00
Timo Reimann
3a7de0be5c Add missing fmt verb specifier in k8s provider. 2017-01-26 11:05:13 +01:00
Adam Stankiewicz
d15a17b634 Allow for wildcards in k8s ingress host, fixes #792 (#1029) 2017-01-20 14:16:05 +01:00
Diego de Oliveira
d74ea22d7d IP-per-task: (#841) 
Support IP per task with marathon/mesos
 2017-01-06 16:26:50 +01:00
Vincent Demeester
8a348423ae Import order as goimports does 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-12-30 19:04:02 +01:00
Julien Salleyron
d469d426f8 Remove useless func in FuncMaps 2016-12-08 20:44:13 +01:00
Julien Salleyron
ec05fbcf19 feat: Add defaultFuncMap to template 2016-12-08 20:44:13 +01:00
Yves Peter
fc788eb426 Kubernetes: cleanup channel handling 
Only use one channel for all watches
Re-use stop channel from the provider
Skip events that have already been handled by the provider, builds on 007f8cc48ea9504bb7754c5e3244124be422f47d
 2016-12-07 20:12:14 +01:00
Phil Kates
87eac1dc1a Fix deadlock in k8s provider 
On a reasonably sized cluster:
63 nodes
87 services
90 endpoints

The initialization of the k8s provider would hang.

I tracked this down to the ResourceEventHandlerFuncs. Once you reach the
channel buffer size (10) the k8s Informer gets stuck. You can't read or
write messages to the channel anymore. I think this is probably a lock
issue somewhere in k8s but the more reasonable solution for the traefik
usecase is to just drop events when the queue is full since we only use
the events for signalling, not their content, thus dropping an event
doesn't matter.
 2016-12-07 20:12:14 +01:00
Emile Vauge
dca08af003
Merge v1.1.1 into master 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-12-06 08:44:23 +01:00
Yves Peter
9236a43a4d kubernetes: moved doc of client to the interface 2016-11-30 19:25:22 +01:00
yvespp
7f4eddf6d6 k8s: changed debug log, removed unneeded stop channels, increased watch channel buffer 2016-11-30 19:16:48 +01:00
Yves Peter
0b78375211 Kubernetes client: set resync period to 5 minutes for more robustness 2016-11-30 19:16:48 +01:00
Yves Peter
15540764a0 Switched Kubernetes provider to new client implementation: https://github.com/kubernetes/client-go 2016-11-30 19:16:48 +01:00
Emile Vauge
841be8d806
Fix Swarm panic 2016-11-28 16:46:37 +01:00
Ryan Leary
055cd01bb7 Fix GroupsAsSubDomains option for Mesos and Marathon (#868) 
* Fix GroupsAsSubDomains option for Mesos and Marathon
* Refactor reverseStringSlice function
 2016-11-28 14:59:08 +01:00
Emile Vauge
926eb099f1
Fix k8s client panic 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-24 19:19:10 +01:00
Alexander Block
b4ea68b88a Fix missing value for k8s watch request parameter (#874) 
Fixes: 732
 2016-11-23 23:21:09 +01:00
WTFKr0
2bf9acd95e Normalize backend even if is user-defined (#865) 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2016-11-23 21:31:37 +01:00
Kristian Klausen
a8cb905255 consul/kv.tmpl: weight default value should be a int (#826) 
* consul/kv.tmpl: weight default value should be a int

Fix #821

* Use 0 as default weight in all backends
 2016-11-23 14:49:55 +01:00
Lewis Headden
567387aee0 Enable TCP Keep Alive for Marathon Client and make value configurable (#784) 
* Resolve rebase conflicts

* Fix imports that VSCode messed up
 2016-11-22 16:11:28 +01:00
Emile Vauge
2dda3d2feb
Fix Kubernetes watch leak 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-17 17:37:06 +01:00
Julien Salleyron
2af6cc4d1b feat(provider): Add Eureka Provider 2016-11-16 22:00:24 +01:00
Ed Robinson
5c0297fb61
Context is part of the stdlib on 1.7 2016-11-16 14:03:23 +00:00
Bruce Lee
e068ee09ca Allow specification of dialertimeout 
Address documentation comments
 2016-11-14 10:57:46 -05:00
Emile Vauge
c9cc3c9895
Fix contraint store/read from KV 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-11-09 21:08:37 +01:00
Guilhem Lettron
85a20b9a39 Use first index for ports 2016-11-02 17:31:27 +01:00
Guilhem Lettron
5641af437e Use first port by default 
If no information is given, use first index of ports
 2016-10-28 11:59:24 +02:00
Guilhem Lettron
1c8d3ded3d Add name to some case to help debug 2016-10-28 11:59:24 +02:00
Emile Vauge
404a73a712
fIx marathon template with dots in ID 2016-10-13 15:33:23 +02:00
Guilhem Lettron
bd5009058b Merge branch 'v1.1' into marathon-lb 2016-10-12 15:51:41 +02:00
Guilhem Lettron
3f65503a79 Add basic compatibility with marathon-lb 
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
 2016-10-07 19:30:16 +02:00
Vincent Lepot
6ac1216f8c Fix networkMap construction (pointer always reference the last network found) 2016-10-07 16:44:33 +02:00
Vincent Demeester
d68389dc52
Add support for docker healthcheck 
- React to health_status events
- Filter container that have a health status *and* that are not healthy

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-03 11:01:37 +02:00
Emile Vauge
b9f76394aa
Update Mesos documentation 2016-09-30 15:37:52 +02:00
Emile Vauge
e72e65858f
Challenge certs PEM encoding 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:25 +02:00
Emile Vauge
a42845502e
Add ACME store 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:17 +02:00
Emile Vauge
bea5ad3f13
Add leadership election 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:05 +02:00
Emile Vauge
5a0440d6f8
Add KV datastore 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 11:26:05 +02:00
Emile Vauge
462d8b3e74
Fix Docker & KV templates for sticky 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-30 10:57:55 +02:00
Emile Vauge
291c3b6dbc
Fix sticky sessions Docker/Marathon labels 2016-09-30 10:56:47 +02:00
Owen Marshall
81fddb4ccf
missed a cherry pick, good start :=/ 2016-09-30 10:56:17 +02:00
Owen Marshall
c9d4c5ae3e
Fix Docker integration problems 2016-09-30 10:56:17 +02:00
Owen Marshall
be5b1fd92b
docs, sticky session for Docker 2016-09-30 10:56:17 +02:00
Owen Marshall
dc52abf4ce
Add sticky session support to Traefik. 
This change adds sticky session support, by using the new
oxy/rr/StickySession feature.

To use it, set traefik.backend.sticky to true.

This is currently only implemented in the wrr load balancer, and against
the Marathon backend, but lifting it should be very doable.

In the wrr load balancer, a cookie called _TRAEFIK_SERVERNAME will be
set with the backend to use.  If the cookie is altered to an invalid
backend server, or the server is removed from the load balancer, the
next server will be used instead.

Otherwise, the cookie will be checked in Oxy's rr on access and if valid
the connection will be wired through to it.
 2016-09-30 10:56:17 +02:00
Emile Vauge
364958cbaf
Move jobs backoff back into traefik 
https://github.com/cenk/backoff/pull/27#issuecomment-245842725
 2016-09-27 21:45:29 +02:00
Diego Osse Fernandes
99c8bffcbf Initial support for Docker 1.12 Swarm Mode 2016-09-27 14:21:38 -03:00
tuier
1624c51cb5 remove unused endpoint when using constraints in marathon 2016-09-23 22:05:11 +01:00
tuier
361dc94002 fmt 2016-09-21 17:27:48 +02:00
tuier
cc0fdf15ef test for task and application constraint 2016-09-21 17:27:47 +02:00
tuier
928675a847 feat(constraints): Support constraint for Marathon provider 2016-09-21 17:27:47 +02:00
Emile Vauge
bb1dde0469
Fix kv 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-09-21 14:33:45 +02:00
Samuel BERTHE
ced69b8397
refacto(constraint-kv): Move constraint checking out of template 2016-09-21 14:33:45 +02:00
Samuel BERTHE
013808956c
feat(constraints): Supports kv stores backends 2016-09-21 14:33:45 +02:00
Vincent Demeester
5ea761e19f
Add possibility to use BindPort IPAddress 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-09-20 14:52:35 +02:00
Bruce Lee
f7f17f0057 enable consul catalog to use maxconn 2016-09-15 12:11:37 -04:00
Bruce Lee
99ca5d0a03 Add ability for marathon provider to set maxconn values 
Initial implementation: Force both to be present to trigger behavior.

add ability to see rendered template in debug

add support for loadbalancer and circuit breaker specification

add documentation for new configuration
 2016-09-14 16:52:02 -04:00
Bruce Lee
d89bdfbd27 Add backend features to docker 2016-09-14 14:51:31 -04:00
Diogo Gomes
1e324ad3bc If Marathon doesn't have healthcheck, assume it's ok (#665) 
Healthcheck are not mandatory, so if a result is not present, assume it
is ok to continue. Fixes the case when a new leader is elected and
don't have any healthcheck result's, returning 404 to all requests.
https://github.com/containous/traefik/issues/653
 2016-09-14 17:44:37 +02:00
Yves Peter
1a20e9f9b4 Kubernetes provider: don't log a warning if traefik.frontend.rule.type is empty, log namespace and ingress if invalide. 2016-09-12 21:06:21 +02:00
Emile Vauge
d340ccd601
Migrate to JobBackOff 2016-08-19 14:24:09 +02:00
Emile Vauge
97ddfcb17a
Use long job RetryBackoff in providers 2016-08-19 11:09:54 +02:00
Emile Vauge
11297b38c5
Remove misused Fatal* 2016-08-19 10:36:54 +02:00
Bruce Lee
0757a75732 fix for nil clientTLS causing issue 2016-08-16 17:50:22 -04:00
Ed Robinson
e3a8fd116d
Don't filter the endpoint and service watches 
We added the ability to filter the ingresses used by traefik based
on a label selector, but we shouldn't need to have matching
labels on every other resource, Ingress allready has a way
to explicty choose which pods end up in the load ballancer
(by refering to the membership of a particular service)
 2016-08-16 06:50:50 +01:00
Ed Robinson
d4f190e995
Name servers after thier pods 
The TargetRef contains information from the object referenced
by the pod, unless the service has been set up with bare
endpoints - i.e. not pointing at pods this information
will be present.

It just makes the information that we show in the web-ui
a little more constent with that shown in kubectl
and the kuberntes dashboard.
 2016-08-06 20:40:40 +01:00
Phil Kates
79dd72f53d
Prioritize kubernetes routes by path length 
The Kubernetes provider wasn't setting priorities which was causing
shorter paths to get chosen before longer ones. This now matches the
[documentation](https://github.com/containous/traefik/blob/master/docs/basics.md#priorities)
 2016-08-03 11:37:22 -07:00
Vincent Demeester
c170ddc7ae Upgrade libkermit and dependencies 
And use ContainerAPIClient where needed 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 17:43:05 +02:00
Vincent Demeester
87a4d73556
Move version.go in its own package… 
… making it possible to use in other packages ; and thus in the
User-Agent header for the docker client.

Also removing the dockerverion hack as it's not required anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 16:33:49 +02:00
Martin
b153e90ec5 add createStore() funcs and skip consul TLS test 2016-07-21 09:22:35 +02:00
Martin
e26e0955b3 add struct ClientTLS : supports either a paths to a file or directly the certificate 2016-07-21 09:22:35 +02:00
Martin
056e0fe2d9 Use KvStores as global config source 2016-07-21 09:22:35 +02:00
julien
5afcf17706 add mesos provider inspired by mesos-dns & marathon provider 2016-07-20 11:56:14 +02:00
Vincent Demeester
b80479f9ef
Option to disable expose of all docker containers 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-14 11:32:15 +02:00
Vincent Demeester
a73baded88
Remove traefik.frontend.value support in docker… 
… provider 👼. Was deprecated in 1.0, removing it for 1.1.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-13 19:28:08 +02:00
Parham Negahdar
9f6484a328 Fixes #363: Allow for kubernetes label selectors 2016-07-12 17:50:01 -04:00
Parham Negahdar
40c0ed092e Fixes #501: prioritize kube.endpoint passed via cli 2016-07-11 15:39:20 -04:00
Emile Vauge
b1ecb1f61f
Use of container.HostConfig.NetworkMode to detect host mode 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-05 14:11:33 +02:00
Emile Vauge
050416224d
Fix host Docker network 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-05 11:29:13 +02:00
Emile Vauge
606e667b88
Fix spamming events in listenProviders 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-23 16:33:54 +02:00
David Keijser
70305266dc Sort nodes before creating consul catalog config 
The watch of consul can return for various reasons and not of all of
them require a reload of the config. The order of nodes provided by
consul is not stable so to ensure a identical config is generated for an
identical server set the nodes needs to be sorted before creating the
config.
 2016-06-23 13:08:12 +02:00
Emile Vauge
b586df6689
Fix marathon tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-22 13:56:28 +02:00
Emile Vauge
4ca2ff0495
Bump go-marathon a558128c87724cd7430060ef5aedf39f83937f55, add DCOS support 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-20 17:11:32 +02:00
Kevin Busse
dcf98d13c8 Fix typo in error message. (#471) 2016-06-20 12:15:31 +02:00
Emile Vauge
56ef678c09
Fix memory leak in listenProviders 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-16 22:49:57 +02:00
Samuel BERTHE
357150bcab fix(constainrs,docker): Syntax 2016-06-11 19:06:39 +02:00
Samuel BERTHE
f7224ff403 feat(constraints): Supports constraints for docker backend 2016-06-11 19:06:39 +02:00
Emile Vauge
223e8cafac
Fix default KV configuration 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-09 23:44:49 +02:00
Vincent Demeester
f286cb9a34
Fix panic if listContainers fails… 
… and also share context accross API call, as this is how it's meant to
be used (and it allows to skip some calls if `cancel` is called).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-06-08 19:39:38 +02:00
Emile Vauge
f4cb4bb1b8
Add routes priorities in providers 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-07 09:18:37 +02:00
Emile Vauge
92ca220890
Add groupsAsSubDomains option 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-03 09:10:59 +02:00
Emile Vauge
72f88e5c0f
Add marathon directory subdomain 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-03 09:10:59 +02:00