Regner Blok-Andersen
71c7920d0f
Merge branch 'master' into kubernetes-support-externalname-service
2017-02-21 10:02:34 -08:00
Vincent Demeester
8c824680ce
Merge pull request #1157 from solidnerd/fix-prometheus-in-traefik-example-toml
...
Fix prometheus metrics example
2017-02-21 09:52:27 +01:00
solidnerd
60b3f74be8
Fix prometheus metrics example
...
Traefik won’t start correctly if heterogeneous numbers in a toml array. This commit makes all numbers homogene.
Signed-off-by: solidnerd <niclas@mietz.io>
2017-02-21 07:55:50 +01:00
Vincent Demeester
dfb09bf2ab
Merge pull request #1172 from timoreimann/stop-considering-glide-lock-as-binary-in-git
...
Remove .gitattributes file.
2017-02-20 21:34:55 +01:00
Timo Reimann
98d6a43e1e
Remove .gitattributes file.
...
Makes git diff Glide lock files as text, which is helpful to see changes
introduced by a 'glide update' run.
2017-02-18 22:56:24 +01:00
Regner Blok-Andersen
49466d0d14
Added documentation about defining the passing of host header globaly
2017-02-15 16:11:31 -08:00
Regner Blok-Andersen
66cc9a075c
First pass of documentation for passHostHeader kubernetes annotation
2017-02-15 13:37:47 -08:00
Regner Blok-Andersen
1e10fc2e30
Simplifying else if statement to be cleaner
2017-02-14 14:57:09 -08:00
Regner Blok-Andersen
c8cf5f8c44
Added a test to make sure passing an invalid value to traefik.frontend.passHostHeader results in falling back correctly.
2017-02-14 11:54:27 -08:00
Regner Blok-Andersen
96e6c9cef2
Split the if/or statement when requesting endpoints from the k8s service so that it now provides two unique log statements.
2017-02-14 11:53:35 -08:00
Regner Blok-Andersen
931ee55e1d
Added default case for PassHostHeader that logs a warning.
2017-02-14 11:52:54 -08:00
Regner Blok-Andersen
4d3aede5d3
Added tests for ingress passHostHeader annotation
2017-02-10 03:27:30 -08:00
Regner Blok-Andersen
0b1dd69b01
Added support for passHostHeader annotation on ingresses
2017-02-10 03:05:59 -08:00
Regner Blok-Andersen
0947aa901e
Initial support for Kubernetes ExternalName service type
2017-02-09 17:25:38 -08:00
Vincent Demeester
01e3d7952a
Merge pull request #1133 from timoreimann/build-binary-for-test-integration-makefile-target
...
Build binary for test-integration Makefile target.
2017-02-08 09:30:08 +01:00
Timo Reimann
84b224b9db
Build binary for test-integration Makefile target.
2017-02-07 15:08:17 +01:00
Emile Vauge
39f8f6868a
Merge pull request #1124 from containous/fix-git-rmpr
...
Fix checkout initial before calling rmpr
2017-02-06 18:49:24 +01:00
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