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

307 commits

Author SHA1 Message Date
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
Emile Vauge
3f08bb4cdf
Fix panic on help, Better version 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-06-02 15:17:04 +02:00
Erin Dachtler
7386378cc0 Merge branch 'master' into docker_network 2016-06-01 08:38:23 -07:00
Samuel BERTHE
1de5434e1a refacto(constraints): Migration to Flaeg cli library 2016-06-01 10:30:34 +02:00
Samuel BERTHE
f46accc74d test(constraint): unit tests + integration tests + make validate 2016-06-01 10:30:34 +02:00
Samuel BERTHE
ac087921d8 feat(constraints): Implementation of constraint filtering (cmd + toml + matching functions), implementation proposal with consul 2016-06-01 10:30:34 +02:00
Erin Dachtler
df7e1cf078 Squashed commit of the following: 
commit 468cdf5c74b8df80fe6cc093feda84d124d47460
Author: Erin Dachtler <download333@gmail.com>
Date:   Mon May 30 17:21:50 2016 -0700

    Documentation update

commit bcbe622141fc333579177e056b49d418997c511d
Author: Erin Dachtler <download333@gmail.com>
Date:   Sat May 28 15:32:34 2016 -0700

    Whoops, forgot to fmt

commit 1ad5f1052541372722adc372069da094b422c793
Author: Erin Dachtler <download333@gmail.com>
Date:   Sat May 28 14:56:04 2016 -0700

    Added getIPAddress helper for docker template, and tests
 2016-05-31 22:11:17 -07:00
Erin Dachtler
f5d49f6657 Merge branch 'master' into no_require_expose 2016-05-28 16:36:59 -07:00
Erin Dachtler
53ae64e578 Filter containers with no exposed ports unless they have a traefik.port label 2016-05-28 15:16:57 -07:00
Martin
cc2735f733 add Debug StructTag 
Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-05-27 10:06:19 +02:00
Martin
f64c2bc065 add flag on ACME 
add flag on Retry

set Retry.MaxMem to 2 by default

rm useless import

rm useless structtag

add custom parser on []acme.Domain type

add commants + refactor
 2016-05-27 10:06:19 +02:00
Martin
6752b49536 rm useless StrucTag 2016-05-27 10:06:19 +02:00
Martin
629be45c4a fix DisablePassHostHeaders 2016-05-27 10:06:19 +02:00
Martin
414fb1f406 add kubernetes.Namespaces parser 2016-05-27 10:06:19 +02:00
Martin
fe0a8f3363 Flaeg integration 2016-05-27 10:06:19 +02:00
Erin Dachtler
45589d5133 Reminder 2016-05-26 11:03:40 -07:00
Ed Robinson
2e735f622f
Adds some more coverage of the endpoint port selection logic. 2016-05-26 12:09:36 +01:00
Ed Robinson
6accb90c47
Simplify Service Lookup 
Since we already know the name and namespace
of the service(s) we want we can just get the
correct one back from the API without filtering
the results.
 2016-05-26 11:17:38 +01:00
Ed Robinson
e948a013cd
Build backend config using the K8S endpoint resource. 
* Potentialy saves a network hop
* Ability to configure LB algothim (given some work to expose an
anotation etc...)
* K8s config Watch is triggered far less often
 2016-05-26 10:52:30 +01:00
Ed Robinson
b79535f369 Support ingresses without a host (#406) 
fixes #370
 2016-05-25 14:16:19 +02:00
Emile Vauge
0f23581f64
Fix k8s memory leak 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-24 23:37:17 +02:00
Jonas Falck
aeb9cc1732 http protocol should not use TLS 
I need this in order to run kubectl proxy and then
make traefik use http://localhost to get to my cluster
when developing
 2016-05-23 09:51:05 +02:00
Ed Robinson
d13b755df2
Allow k8s ports to be referenced by name as well as number 2016-05-19 13:36:19 +01:00
Ed Robinson
5923d22379
The referenced k8s service(s) must be in namespace 
By design k8s ingress is only designed to ballance services from within
the namespace of the ingress.

This is disscuessed a little in
https://github.com/kubernetes/kubernetes/issues/17088.

For now traefik should only reference the services in the current
namespace. For me this was a confusing change of behaviour
from the reference implimentations, as I have services
with the same name in each namespace.
 2016-05-18 17:38:47 +01:00
AlmogBaku
8210743dad change log error of "ruleType" to warning 2016-05-17 16:54:40 +03:00
AlmogBaku
895f3cc109 fixes golint error 2016-05-17 16:22:37 +03:00
AlmogBaku
71f160dddc Following up to the conversation on Slack & GitHub: 
- Change the annotation to define the rule type in `traefik.frontend.rule.type`
 - Update tests
 - Add documentation
 - Add example
 2016-05-17 13:50:06 +03:00
AlmogBaku
92abaa0d47 fixes wrong actual on unit-test 2016-05-16 01:24:23 +03:00
AlmogBaku
47710c1385 fixes wrong names on tests - make it pass 2016-05-16 01:06:30 +03:00
AlmogBaku
df3abcbc9a gofmt to tests.. 2016-05-15 20:01:26 +03:00
AlmogBaku
dbb7ad41e5 Add tests for k8s PathPrefixStrip annotation 2016-05-15 12:16:27 +03:00
AlmogBaku
9773d4e409 K8s: add an option to configure "PathPrefixStrip" for the ingress-resource using annotation 2016-05-15 12:00:20 +03:00
Emile Vauge
d89279d708
Replace PathPrefixStrip by PathPrefix in k8s 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-12 12:44:26 +02:00
Marcus Stong
be209ed30c #216: sets passHostHeader to true by default (#351) 2016-05-10 13:43:24 +02:00
David Keijser
b9bb78d04b Normalise tags in backend name of consul_catalog 
Another fun thing consul lets you do is use spaces in your tags. This
means when including tags in backend name it's possible to generate
invalid names.
 2016-05-07 16:30:38 +02:00
Ed Robinson
301a463aeb
Adds option to namespace k8s ingresses 
If the flag kubernetes.namespaces is set...
Then we only select ingresses from that/those namespace(s)

This allows multiple instances of traefik to
independently load balance for each namespace.
This could be for logical or security reasons.

Addresses #336
 2016-05-06 11:36:53 +01:00
Emile Vauge
c3aadab615
Add Consul integration tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-03 15:41:09 +02:00
Emile Vauge
61def880db
Fix etcd backend with prefix / 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-03 15:41:09 +02:00
Poney baker
378a261e64 feat(consul-provider): If Service.Address is nil then use Node.Address 
test(consul-catalog): Test on backend-name and backend-address
 2016-04-27 21:09:42 +02:00
Emile Vauge
87caf458df
Fix Kubernetes schema 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Emile Vauge
4ff4e4e626
Fix Kubernetes watch SSL 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-27 10:05:04 +02:00
Emile Vauge
53a2787626
Fix watch pods/services/rc/ingresses 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-25 17:13:26 +02:00
Emile Vauge
cac9927395
Fix namespace, fix PathPrefixStrip 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Emile Vauge
c0dd4c3209
Add unit test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Emile Vauge
d82e1342fb
Fix integration test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
emile
720912e880
Add kubernetes Ingress backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-22 13:57:00 +02:00
Poney baker
6f13a2c0c7 feat(consul-catalog): Remove frontend when backends disabled 2016-04-22 11:55:31 +02:00
Emile Vauge
06d2f343dd
Fix KV backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-19 23:49:26 +02:00
Samuel BERTHE
45d6a326cd fix(consul-provider): Compare consul catalog tag keys with lowered case 2016-04-19 17:27:19 +02:00
Emile Vauge
2a3a34a80c
Fix Marathon backend 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-19 12:05:28 +02:00
Emile Vauge
36338b4928
add backoff to marathon provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-16 17:21:24 +02:00
Vincent Demeester
4144638be4
Support stop chan on docker provider 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-16 14:46:35 +02:00
Emile Vauge
c1078c4374
Fix races 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-14 15:27:42 +02:00
kevin
a15578a8f6 Add support for maximum connections for backends. 2016-04-13 09:37:11 -07:00
Emile Vauge
a9e615b3c7 Fix period in frontend name in KV store 2016-04-13 14:56:51 +02:00
Samuel BERTHE
4f044cf2f9 feat(consul-catalog-provider): + setting unique backend name + backend redirecting to internal container ip 2016-04-13 08:05:44 +02:00
Vincent Demeester
866b9835a6
Migrate traefik to engine-api 
The docker provider now uses docker/engine-api and
vdemeester/docker-events instead of fsouza-dockerclient.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-04-08 14:21:02 +02:00
Emile Vauge
bcc5f24c0f
Add GoSafe goroutine launch 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-04-01 14:01:31 +02:00
Emile Vauge
d5e1d2efd5
Fix documentation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-31 16:17:59 +02:00
Emile Vauge
bb072a1f8f
Add backwards compatibility 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-31 13:11:18 +02:00
Emile Vauge
8737530a7d
Refactor frontends rules 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-31 13:11:07 +02:00
Emile Vauge
6e484e5c2d
add let's encrypt support 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-21 20:15:28 +01:00
Nikita Borzykh
c313950891 Add exposedByDefault option to marathon section 2016-03-21 12:37:02 +03:00
Advait Shinde
7674a82801 Fatalf for timeout cases. 2016-03-05 20:43:44 +00:00
Advait Shinde
d63d2a8a26 Support libkv.WatchTree chan errors: 
- libkv.WatchTree returns a channel whose messages represent changes
    to the watched tree. In situations where libkv cannot read from the
    underlying store, libkv will close the provided channel.
  - This PR handles this edge case and fixes #238.
 2016-03-05 20:38:33 +00:00
Graham Taylor
3063251d43 Use event stream API instead of event subscriptions 2016-03-02 09:22:14 +00:00
Emile Vauge
defbb44b35 Fix docker network 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-03-01 11:52:30 +00:00
Advait Shinde
3cf848958f Support multiple endpoints for KV stores: 
- Fixes #222
 2016-02-25 23:34:51 +00:00
Thomas Boerger
dc10c56b35 Integrated TLS auth for etcd and consul 2016-02-24 23:32:34 +01:00
Emile Vauge
1881d5eeed
Transfer emilevauge/traefik to containous/traefik 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-02-24 17:38:36 +01:00
David Keijser
ae275c9e60 Consul catalog provider 
Fixes #176
 2016-02-24 09:23:27 +01:00
emile
9a9c8e5709 Add Marathon TLS client config 
Signed-off-by: emile <emile@vauge.com>
 2016-02-18 12:42:59 +00:00
Advait Shinde
aacedcc4b3 Implement /traefik/alias for KV stores. 2016-02-15 18:14:57 -05:00
emile
c6c3af8099
Fix regression on marathon backend 
Signed-off-by: emile <emile@vauge.com>
 2016-02-12 15:03:28 +01:00
emile
a8cc26fd91
Add entrypoints to providers 2016-02-10 12:14:16 +01:00
emile
81cb00573f
Fix tests to accept entrypoints 2016-02-10 12:14:16 +01:00
Graham Taylor
2d79c500df Fix #170 - lookup backend for marathon plugin so we can specify traefik.backend via labels on the container 2016-02-05 18:01:47 +00:00
Patrick O'Connor
31e0340959 Updated getEscapedName with slash to dash instead of space 
Remove only the first slash, convert the rest to dash
 2016-02-03 12:07:08 -08:00
emile
35070f7c1c
Use of Viper and cobra 2016-01-27 13:56:46 +01:00
emile
c46ffed846
Add basic authentication support in Marathon 2016-01-18 13:23:38 +01:00
Dylan Meissner
cfbd43d1ee Marathon provider uses port or portIndex from label. 2016-01-12 06:46:29 -08:00
emile
e728f32a15 Removes getBool from kv provider, fixes https://github.com/emilevauge/traefik/issues/117 2015-12-04 09:28:43 +01:00
emile
8fdd0b20d1 Add filter task by running status in marathon 2015-12-01 22:53:31 +01:00
emile
6e62625ebf Add GetBool function in KV provider, used by passHostHeader 2015-11-22 23:39:43 +01:00
KM Tong
76bd04e349 Merge branch 'master' into docker-tls 2015-11-20 23:13:26 +08:00
唐家文
a8a78b8ea3 docker TLS support 2015-11-20 23:05:06 +08:00
Vincent Demeester
4d485e1b6b Refactor providers and add tests 
- Add a `baseProvider` struct with common
- Refactor docker, kv(s) and marathon providers (spliting into small pieces)
- Add unit tests

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-19 17:22:17 +01:00
Peter Olds
481a4b2096 Replace [ and ] in frontend names 
Signed-off-by: Peter Olds <polds@kyanicorp.com>
 2015-11-12 17:04:19 -07:00
Vincent Demeester
15318c4631 Fix docker labels (frontend.*) 
Using Docker provider, you can specify `traefik.frontend.rule` and
`traefik.frontend.value` labels. If they are not both provided, there is
a default behavior. On the current master, if they are not defined, the
container is filtered (and thus the default behavior is broken).

Fixes that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-05 15:14:25 +01:00
Vincent Demeester
89bb1ae835 Linting provider package 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 21:15:03 +01:00
Vincent Demeester
cdade5f649 Rename NameProvider to Name 
Because golint is gonna cry at some point otherwise.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 19:48:34 +01:00
Vincent Demeester
de0a57ec76 Refactor traefik with package 
Split a bit traefik into package. The idea behind this refactor is to
start move inter-dependencies away and do some DRY or SRP.

- Adds a `provider` package, with providers except `web.go`
- Adds a `types` package with common struct.
- Move `gen.go` to an `autogen` package

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-11-02 18:35:55 +01:00