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

2423 commits

This branch
This branch
All branches
Author SHA1 Message Date
Timo Reimann
4310bdf3ca Merge pull request #1458 from ben-st/update_readme 
update wording
 2017-04-23 00:44:44 +02:00
Benjamin
6cb8df9d1e update wording 2017-04-22 23:49:38 +02:00
Timo Reimann
93e123b489 Merge pull request #1467 from mattcollier/patch-1 
Fix typo in command line help.
 2017-04-22 23:01:03 +02:00
mattcollier
8764c43eaf Fix typo in command line help. 2017-04-21 14:01:45 +02:00
Timo Reimann
10e22c0b3f Merge pull request #1469 from containous/improve-frontend-rule-documentation 
Improve documentation for frontend rules.
 2017-04-21 01:10:13 +02:00
Timo Reimann
051f0c6855 Improve documentation for frontend rules. 
Includes guidelines on proper usage of the more complex path matchers.
 2017-04-21 00:30:27 +02:00
Timo Reimann
809103f4b2 Merge pull request #1473 from mattcollier/patch-2 
Correct typo in code comment.
 2017-04-20 22:01:16 +02:00
mattcollier
b7c2e2d3f1 Correct typo and use Godoc convention in comment. 2017-04-20 14:02:29 -04:00
Vincent Demeester
d866a62b56 Merge pull request #1468 from containous/traefik-pronunciation-pages 
Mention Traefik pronunciation in docs too.
 2017-04-20 14:00:44 +02:00
Timo Reimann
22ac60205a Mention Traefik pronunciation in docs too. 
Also replace Træfɪk with Træfik.
 2017-04-20 12:08:12 +02:00
Vincent Demeester
de557d031b Merge pull request #1449 from vdemeester/more-extraction 
Extract some code in packages
 2017-04-20 11:37:40 +02:00
Vincent Demeester
7fcb7b86d3 Extract some code in packages 
- This will help split stuff in smaller, better tested packages
- This moves some stuff like the traefik command to package `cmd`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-20 10:06:41 +02:00
Vincent Demeester
9c9015a7b1 Merge pull request #1398 from containous/fix-default-timeouts-for-marathon-provider 
Fix default timeouts for Marathon provider.
 2017-04-20 08:37:20 +02:00
Timo Reimann
360e8e19ce Fix default timeouts for Marathon provider. 
The timeouts were given without a unit, which caused nanoseconds scale
to be applied when we switched the type from int to flaeg.Duration.
 2017-04-20 01:51:10 +02:00
Timo Reimann
dd52ee9f9b Merge pull request #1147 from SantoDE/feature-http-basic-auth-frontend 
Add Basic Auth per Frontend.
 2017-04-20 00:26:39 +02:00
Manuel Laufenberg
8a892b21e1 Add Basic Auth per Frontend for Rancher & Docker Dynamic Provider 2017-04-19 21:05:43 +02:00
Vincent Demeester
4e0f131fcd Merge pull request #1453 from martinbaillie/rancher-provider-pagination-fixes 
Fix Rancher API pagination limits
 2017-04-19 13:36:55 +02:00
Martin Baillie
d1ee72b308
Merge branch 'master' into rancher-provider-pagination-fixes 2017-04-19 20:47:30 +10:00
Vincent Demeester
f03a9e502f Merge pull request #1444 from vdemeester/extract-providers 
Extract providers to their own packages
 2017-04-18 22:54:49 +02:00
Vincent Demeester
542c3673e4 Extract providers to their own package 
This is just doing that and making it compile :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-18 13:24:17 +02:00
Vincent Demeester
2d00758b2e Merge pull request #1455 from martinbaillie/fix-traefik-sample-toml 
Fix Rancher backend left in uncommented state
 2017-04-18 11:56:37 +02:00
Martin Baillie
73f09f389e Fix Rancher API pagination limits 
This fix allows the Traefik Rancher provider to obtain a complete view
of the environments, services and containers being managed by the
Rancher deployment.
 2017-04-18 19:48:43 +10:00
Martin Baillie
29bada9ae3 Fix Rancher backend left in uncommented state 2017-04-18 15:00:18 +10:00
Vincent Demeester
4ce2c8cc34 Merge pull request #1448 from vdemeester/fix-master-windows-compilation 
Update golang.org/x/sys to fix windows compilation
 2017-04-17 20:44:07 +02:00
Vincent Demeester
b02b11a606 Update golang.org/x/sys to fix windows compilation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 20:08:40 +02:00
Vincent Demeester
e38fa25412 Merge pull request #1447 from vdemeester/dont-binary-twice 
[ci] Don't run binary twice
 2017-04-17 19:34:39 +02:00
Vincent Demeester
38b2362a31
Don't run binary twice 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 18:51:37 +02:00
Vincent Demeester
13754f06e3 Merge pull request #1445 from vdemeester/pull-in-pre 
Pull images before running CI
 2017-04-17 18:13:10 +02:00
Vincent Demeester
ade223cf2e Pull images before running CI 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 17:28:34 +02:00
Vincent Demeester
2118f6992a Merge pull request #1440 from vdemeester/docker-provider-refacto 
Few refactoring around the docker provider
 2017-04-17 17:28:13 +02:00
Vincent Demeester
b04ba36682 Update some docker provider test 
- Split the file into smaller ones (docker, swarm and service tests)
- Use some builder to reduce a little bit the noise for creating containers

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 15:40:55 +02:00
Vincent Demeester
3f293ee25b Move docker provider to its own package 👼 
Makes it simpler to manage :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-04-17 15:40:55 +02:00
Timo Reimann
dc01094863 Merge pull request #1442 from martinbaillie/master 
Pass stripped prefix downstream as header (#985)
 2017-04-17 09:07:13 +02:00
Martin Baillie
fa683fa7e4 Pass stripped prefix downstream as header 2017-04-16 19:24:26 +10:00
Timo Reimann
1da47dfcbb Merge pull request #1404 from aolwas/k8s-rbac-doc-update 
Add documentation for k8s RBAC configuration.
 2017-04-13 01:13:52 +02:00
Maxime Cottret
fc3cc9a919 Add documentation for k8s RBAC configuration 2017-04-13 00:27:16 +02:00
Emile Vauge
12a0026e21 Merge pull request #1383 from containous/merge-v1.2.1-master 
Merge v1.2.1 master
 2017-04-12 09:13:03 +02:00
Emile Vauge
aeb17182b4
Merge v1.2.1-master 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:56 +02:00
Emile Vauge
a590155b0b
Prepare release v1.2.1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Emile Vauge
87ce060737
bump lego 0e2937900 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Timo Reimann
f2297dd3ed
k8s: Do not log service fields when GetService is failing. 
Update tests too.
 2017-04-11 22:36:55 +02:00
Emile Vauge
2cd4c82092
Prepare release v1.2.0 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Emile Vauge
6edc0926eb
sub-tests + Fatalf/Errorf 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Emile Vauge
a456d36cc6
Add Docker task list test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
yshay
5c2d91ab84
Add check on task status in addition to desired status 2017-04-11 22:36:55 +02:00
Sebastian
a73fee50dc
Docker: Added warning if network could not be found (#1310) 
* Added warning if network could not be found

* Removed regex import from master

* Corrected wrong function call
 2017-04-11 22:36:55 +02:00
Regner Blok-Andersen
b02393915e
Abort Kubernetes Ingress update if Kubernetes API call fails (#1295) 
* Abort Kubernetes Ingress update if Kubernetes API call fails

Currently if a Kubernetes API call fails we potentially remove a working service from Traefik. This changes it so if a Kubernetes API call fails we abort out of the ingress update and use the current working config. Github issue: #1240

Also added a test to cover when requested resources (services and endpoints) that the user has specified don’t exist.

* Specifically capturing the tc range as documented here: https://blog.golang.org/subtests

* Updating service names in the mock data to be more clear

* Updated expected data to match what currently happens in the loadIngress

* Adding a blank Servers to the expected output so we compare against that instead of nil.

* Replacing the JSON test output with spew for the TestMissingResources test to help ensure we have useful output incase of failures

* Adding a temporary fix to the GetEndoints mocked function so we can override the return value for if the endpoints exist.

After the 1.2 release the use of properExists should be removed and the GetEndpoints function should return false for the second value indicating the endpoint doesn’t exist. However at this time that would break a lot of the tests.

* Adding quick TODO line about removing the properExists property

* Link to issue 1307 re: properExists flag.
 2017-04-11 22:36:55 +02:00
Emile Vauge
b99a919bb4
Refactor k8s client config 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Emile Vauge
51f3f6ba9c
Removed unused log 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00
Emile Vauge
736f9b30ef
Fix default config in generic Mesos provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 22:36:55 +02:00