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

4383 commits

This branch
This branch
All branches
Author SHA1 Message Date
Regner Blok-Andersen
f530284031 Adding support for Traefik to respect the K8s ingress class annotation (#1182) 2017-03-03 20:30:22 +01:00
Timo Reimann
38c0cf7007 Merge pull request #1151 from timoreimann/refactor-k8s-rule-type-annotation-logic 
Refactor k8s rule type annotation parsing/retrieval.
 2017-03-03 18:48:59 +01:00
Timo Reimann
f3598e6b0f Refactor k8s rule type annotation parsing/retrieval. 
- Move annotation logic into function.
- Constantify strings.
- Refactor TestRuleType.
- Add test for GetRuleTypeFromAnnotations.
 2017-03-03 13:33:00 +01:00
Vincent Demeester
291ca860af Merge pull request #1216 from timoreimann/elaborate-on-regexp 
Motivate and explain regular expression rules.
 2017-03-03 10:09:30 +01:00
Timo Reimann
7d20871f0d Fix typos. 2017-03-03 00:27:33 +01:00
Timo Reimann
6942b063ee Motivate and explain regular expression rules. 2017-03-02 23:00:25 +01:00
Timo Reimann
e56bd27c1e Remove blank space. 2017-03-02 23:00:25 +01:00
Timo Reimann
a3beec6b9c Merge pull request #1214 from timoreimann/avoid-validate-glide-output-suppression 
Evaluate glide-hash result without reading $?.
 2017-03-02 23:00:01 +01:00
Timo Reimann
04a1ecc4f4 Evaluate glide-hash result without reading $?. 
validate-glide is called with errexit enabled (in script/make.sh that
sources validate-glide), which means that grep returning a non-zero exit
code will cause the script to terminate prematurely. Thus, we will never
get to the point where we see the error message.

The fix is to embed the grep check directly inside the if statement.
 2017-03-02 18:49:13 +01:00
Manuel Laufenberg
7707814f2e Merge pull request #1215 from timoreimann/add-timoreimann-to-maintainer-list 
Add @timoreimann to list of maintainers.
 2017-03-02 17:59:00 +01:00
Timo Reimann
4d4f2b62aa Add @timoreimann to list of maintainers. 2017-03-02 02:00:53 +01:00
Emile Vauge
5abffe402f Merge pull request #1194 from timoreimann/example-ip-addr-binding 
Add Traefik TOML sample section on how to bind to specific IP addr.
 2017-02-28 09:57:23 +01:00
Timo Reimann
38ec32a146 Add Traefik TOML sample section on how to bind to specific IP addr. 2017-02-25 21:44:01 +01:00
Vincent Demeester
d77ad42326 Merge pull request #1149 from Regner/kubernetes-support-externalname-service 
Kubernetes support externalname service
 2017-02-22 10:52:35 +01:00
Regner Blok-Andersen
4106f0fa9e Merge branch 'master' into kubernetes-support-externalname-service 2017-02-21 16:19:01 -08:00
Vincent Demeester
a0a0bf0577 Merge pull request #1170 from timoreimann/upgrade-go-marathon-to-v0.7.0 
Upgrade dependencies.
 2017-02-21 20:45:22 +01:00
Regner Blok-Andersen
71c7920d0f Merge branch 'master' into kubernetes-support-externalname-service 2017-02-21 10:02:34 -08:00
Timo Reimann
9bb1b01742 Upgrade dependencies. 
Brings github.com/gambol99/go-marathon version 0.7.1.
 2017-02-21 16:10:45 +01: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