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

1199 commits

This branch
This branch
All branches
Author SHA1 Message Date
Emile Vauge
556915cab6
Fix checkout initial before calling rmpr 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 17:50:11 +01:00
Emile Vauge
bff654b843 Merge pull request #1120 from SantoDE/feature-rancher-integration 
Feature rancher integration
 2017-02-06 17:49:38 +01:00
Manuel Laufenberg
3a875e2954 add default config 
lint files
 2017-02-06 17:03:43 +01:00
Manuel Laufenberg
bdb63ac785 add watch function 2017-02-06 17:03:43 +01:00
Manuel Laufenberg
9a5dc54f85 add some unit tests 
fmt & lint
 2017-02-06 17:03:41 +01:00
Manuel Laufenberg
48524a58ff fix all containers - no matter of pagination 
fmt & lint
 2017-02-06 17:03:38 +01:00
Manuel Laufenberg
38bd49b97e add dependency, start provider and fetch data 
add tons of labels

Provide - WIP

add rancher data over rancher types

first version of direct fetch - pagination still an issue
 2017-02-06 17:02:53 +01:00
Emile Vauge
28054a0be3 Merge pull request #1061 from WTFKr0/replace_underscores_in_url 
Replace underscores to dash in autogenerated urls (docker provider)
 2017-02-06 16:32:28 +01:00
WTFKr0
250a0863f6
Tab Lint 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
WTFKr0
b1764a6864
Adapt test to new urls 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
WTFKr0
41f8f0113b
Replace underscores to dash in autogenerated urls (docker provider) 
Signed-off-by: WTFKr0 <thomas.kovatchitch@gmail.com>
 2017-02-06 15:38:18 +01:00
Emile Vauge
db63e84a9f Merge pull request #1033 from foleymic/feature-1024 
Support sticky sessions under SWARM Mode. #1024
 2017-02-06 15:23:47 +01:00
Mike Foley
e0a4c58081
Added service name to dockerData struct. 
In Swarm mode with with Docker Swarm’s Load Balancer disabled (traefik.backend.loadbalancer.swarm=false)
service name will be the name of the docker service and name will be the container task name
(e.g. whoami0.1).  When generating backend and fronted rules, we will use service name instead of name if a
rule is not provided.

Initialize dockerData.ServiceName to dockerData.Name to support non-swarm mode.
 2017-02-06 14:44:25 +01:00
Mike Foley
d2b47a5681
Support sticky sessions under SWARM Mode. 
SWARM Mode has it's own built in Load balancer, so if we want to leverage sticky sessions,
 or if we would just prefer to bypass it and go directly to the containers (aka tasks), via
	--label traefik.backend.disable.swarm.loadbalancer=true
 then we need to let Traefik know about the underlying tasks and register them as
 services within it's backend.
 2017-02-06 14:44:25 +01:00
Emile Vauge
106e5c1f92 Merge pull request #1109 from containous/fix-git-rpr-upstream 
Fix git rpr
 2017-02-06 14:40:45 +01:00
Emile Vauge
c00a9fae0c
Add rmpr command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
087bbd2e3e
Add cpr command 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
e16f2bb23d
Fix git rpr 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-06 14:02:23 +01:00
Emile Vauge
8d0bacf146 Merge pull request #1098 from ddunkin/fix-k8s-example-ui 
Fix k8s example UI port.
 2017-02-06 11:06:32 +01:00
Dave Dunkin
354f69b2f6
Fix k8s example UI port. 
Port was out of sync from 495cba591f6f558d5e43804a82b3ba5778913eb3.
 2017-02-06 10:18:16 +01:00
Emile Vauge
39e6b16069 Merge pull request #918 from Juliens/httpchk 
(WIP) feat: HealthCheck
 2017-02-06 10:15:37 +01:00
Julien Salleyron
b30272d896 fix lint 2017-02-06 09:36:30 +01:00
Julien Salleyron
755822bf14 fix after review 2017-02-06 09:36:30 +01:00
Julien Salleyron
99ffc26d40 One goroutine for each backend + fix typo 2017-02-06 09:36:30 +01:00
Julien Salleyron
4a8f032304 feat: timeout on check 2017-02-06 09:36:30 +01:00
Julien Salleyron
a0b775a7c0 Lint on healthcheck 2017-02-06 09:36:30 +01:00
Julien Salleyron
0ab0bdf818 feat: HealthCheck 2017-02-06 09:36:30 +01:00
Emile Vauge
fce32ea5c7 Merge pull request #1088 from lpetre/amazon_ecs_provider 
Add an ECS provider
 2017-02-05 21:01:17 +01:00
Luke Petre
8d3c77a0b9 Add an ECS provider 2017-02-05 18:09:30 +00:00
Emile Vauge
00de73bdfc Merge pull request #1119 from containous/fix-glide-go-units 
Fix glide go units
 2017-02-05 18:59:32 +01:00
Emile Vauge
96197af3f1
Add glide hash validation 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-05 17:24:14 +01:00
Emile Vauge
dacde21c27
Fix glide.yml go-units 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-02-05 17:24:13 +01:00
Emile Vauge
0d3b2ed230 Merge pull request #1115 from StefanScherer/check-file-permission-unix-only 
Skip file permission check on Windows
 2017-02-05 13:49:00 +01:00
Stefan Scherer
fa4226c742 Skip file permission check on Windows 2017-02-05 10:30:56 +01:00
Vincent Demeester
7cb4c42772 Merge pull request #1116 from vdemeester/carry-watchdog 
Carry #818 —  Add systemd watchdog feature
 2017-02-05 10:29:50 +01:00
Guilhem Lettron
99f251451e
Update glide 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-02-05 10:05:32 +01:00
Guilhem Lettron
d5f9a80b6c Remove web watchdog 2017-02-04 19:06:56 +01:00
Guilhem Lettron
d324040adc Add systemd watchdog feature 2017-02-04 19:06:24 +01:00
Emile Vauge
da5eba17d8 Merge pull request #1113 from StefanScherer/fix-docker-api-version-for-windows 
Fix Docker API version for Windows
 2017-02-04 17:26:05 +01: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
Emile Vauge
71a185c70e Merge pull request #1090 from diegooliveira/IP-Per-Task-Fix 
Fix marathon provider
 2017-02-04 16:41:49 +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
Vincent Demeester
89ec25f718 Merge pull request #1084 from JamesKyburz/feature/fix-gzip-for-websockets 
update NYTimes/gziphandler fixes #1059
 2017-02-04 16:02:39 +01:00
Emile Vauge
e5b688214c Merge branch 'master' into feature/fix-gzip-for-websockets 2017-02-04 15:18:22 +01:00
Brian Akins
225dbcce0a Allow setting circuitbreaker expression via Kubernetes annotation (#1056) 2017-02-03 17:47:48 +01:00
Vincent Demeester
b22dc213e8 Merge pull request #1080 from jangie/only-add-marathon-balancees-if-any-healthcheck-results 
Ensure that we don't add balancees with no health check runs if there is a health check defined on it
 2017-02-03 15:55:23 +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
Vincent Demeester
29059b77a8 Merge pull request #1078 from geoffgarside/release-build-bsd 
Add FreeBSD & OpenBSD to crossbinary
 2017-02-03 13:50:39 +01:00
Geoff Garside
cdaa64a4b2 Add OpenBSD to script/crossbinary 2017-02-03 12:02:20 +01:00
Geoff Garside
bc4296729f Add FreeBSD to script/crossbinary 2017-02-03 12:02:20 +01:00