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

795 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
AlmogBaku 97c8a1d7ab fixes wrong "default" for k8s annotation in document... 2016-05-19 01:09:32 +03: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
Vincent Demeester 70494117d1 Merge pull request #373 from AlmogBaku/master 
K8s: add an option to configure "PathPrefixStrip" for the ingress-resource using annotation
 2016-05-18 17:19:11 +02: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 993165fa66 Added Devoxx Video & support (#371) 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-13 17:32:39 +02:00
Emile Vauge c49f5dad05 Merge pull request #368 from vdemeester/update-docker-deps 
Update docker dependencies to fix issues
 2016-05-13 08:21:09 +02:00
Vincent Demeester c0bdedfed3
Add travis matrix for 1.9.1 and 1.10.1 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-12 17:18:58 +02:00
Vincent Demeester 061107b65f
Update docker dependencies to fix issues 
Update engine-api, libcompose and related dependencies (including
libkermit), to fix issues with docker v1.9.1 and lower.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-05-12 17:10:42 +02:00
Vincent Demeester 7bf421f847 Merge pull request #369 from containous/fix-hijack-logger 
fix hijack logger middleware
 2016-05-12 17:06:15 +02:00
Emile Vauge cb0c1d34a2
fix hijack logger middleware 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-05-12 16:32:12 +02:00
Vincent Demeester 749b381f26 Merge pull request #355 from containous/change-PathPrefixStrip-k8s 
Replace PathPrefixStrip by PathPrefix in k8s
 2016-05-12 13:56:43 +02: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
Emile Vauge 4a4ba2791d Merge pull request #357 from s7anley/generate-fix 
Create static folder on first generate
 2016-05-09 23:47:23 +02:00
Ján Koščo c61d9776e7 Create static folder on first generate 2016-05-09 23:13:22 +02:00