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

867 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
8caaf317ae Merge pull request #412 from containous/prepare-release-candidate 
Prepare release candidate
 2016-05-30 18:27:48 +02:00
Emile Vauge
0e3c2ef10f
Fix log config file 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 17:57:57 +02:00
Emile Vauge
db6c85d3d7
Prepare release candidate 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-30 17:48:50 +02:00
Vincent Demeester
2bd95620a5 Merge pull request #420 from cocap10/fixes-log 
log info about TOML configuration file using
 2016-05-30 17:48:00 +02:00
Martin
d8ad30f38a log info about TOML configuration file using 
+glide update flaeg & staert
+fix README.md
+fix configFile flag description

Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-05-30 17:04:26 +02:00
Vincent Demeester
aad5f52968 Merge pull request #416 from download13/no_require_expose 
Don't filter out containers with no exposed port if they have a traefik.port label set
 2016-05-30 11:21:49 +02: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
Vincent Demeester
1a936b6aca Merge pull request #403 from cocap10/migrate-to-staert 
Migrate to staert
 2016-05-27 16:41:44 +02:00
Martin
4776fa1361 add parsers tests 
Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-05-27 13:23:38 +02:00
Martin
c5084fd025 update staert + glide pin version 2016-05-27 10:06:19 +02:00
Martin
cc2735f733 add Debug StructTag 
Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-05-27 10:06:19 +02:00
Martin
7f6b2b80f8 rm useless TestNoOrInexistentConfigShouldNotFail 
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
ab138e7df1 update to new version go-bindata-assetfs 2016-05-27 10:06:19 +02:00
Martin
059da90a96 clean glide dependancies 2016-05-27 10:06:19 +02:00
Martin
0821c7bdd9 Add version in logs 2016-05-27 10:06:19 +02:00
Martin
89e00eb5a4 add staert & fleag 2016-05-27 10:06:19 +02:00
Martin
1a0f347023 update default value 2016-05-27 10:06:19 +02:00
Martin
1e27c2dabe fix TestNoOrInexistentConfigShouldNotFail 2016-05-27 10:06:19 +02:00
Martin
629be45c4a fix DisablePassHostHeaders 2016-05-27 10:06:19 +02:00
Martin
e115e3c4e7 fix default value 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
Vincent Demeester
7804787e9e Merge pull request #408 from errm/k8s-endpoints 
Build backend config using the K8S endpoint resource.
 2016-05-26 17:12:23 +02: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
Vincent Demeester
ed3bcc6d9a Merge pull request #387 from containous/fix-k8s-memory-leak 
Fix k8s memory leak
 2016-05-25 09:57:42 +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
Emile Vauge
2af1e4b192
Fix k8s compose file 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-24 23:31:35 +02:00
Emile Vauge
dc404b365f
Add expvar endpoint 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-24 23:31:35 +02:00
Emile Vauge
86f3891a2b
Add debug flag 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-24 23:31:35 +02:00
Vincent Demeester
86053ea54b Update Makefile to fix local builds (#397) 
Use --build-arg only if DOCKER_VERSION is specified

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-23 16:07:35 +02:00
Vincent Demeester
938600ba95 Merge pull request #398 from containous/fix-safari-http2 
Fix safari http2
 2016-05-23 14:37:19 +02:00
Emile Vauge
80ab967d39
Fix benchmarks doc 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-23 14:02:25 +02:00
Emile Vauge
43acbaa702
Fix safari error with http2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-23 14:00:14 +02:00
Vincent Demeester
5d6492e6f5 Merge pull request #395 from vdemeester/carry-pr-382 
Carry: http protocol should not use TLS
 2016-05-23 13:11:56 +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
Vincent Demeester
fa25c8ef22 Merge pull request #394 from vdemeester/carry-pr-312 
Carry: Updating Toml to sure PathPrefix instead of Path
 2016-05-23 09:50:38 +02:00
Russell Clare
77a9613c3a Updating Toml to sure PathPrefix instead of Path 2016-05-23 09:35:18 +02:00
Almog Baku
ba62a1f630 Merge branch 'master' into master 2016-05-20 21:13:59 +03:00
Vincent Demeester
153ab8f0fa Update engine-api to fix versions issues (#383) 
Updating an engine-api that has fixed some versioning issues (filters
json marshalling)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-19 21:11:30 +02:00
Vincent Demeester
f6c860afc0 Merge pull request #380 from errm/k8s-ref-ports-by-name 
Allow k8s ports to be referenced by name as well as number
 2016-05-19 15:00:12 +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
Vincent Demeester
6bacbf6cac Merge pull request #379 from errm/k8s-services-from-same-namespace 
The referenced k8s service(s) must be in namespace
 2016-05-19 14:08:53 +02:00
AlmogBaku
0d5baa2219 Merge branch 'master' of https://github.com/containous/traefik 2016-05-19 01:10:44 +03:00