SW/traefik
2
0
Fork 1
forked from Ivasoft/traefik
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,218 Commits 21 Branches 402 Tags
c766439fedffd65e257a0d0cd9dbad20fe97f06a
Commit Graph

1218 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Emile Vauge
c766439fed Merge pull request #1420 from containous/prepare-release-v1.2.2 
Prepare release v1.2.2
v1.2.2 		2017-04-11 22:05:04 +02:00
Emile Vauge
0ecfbb8279 Prepare release v1.2.2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-11 20:13:18 +02:00
Emile Vauge
82d631572c Merge pull request #1417 from containous/carry-pr-1271 
Carry PR 1271
 2017-04-11 20:10:14 +02:00
Adam Geiger
fa4d2d325d Fix redirect empty backend 
Issue-#679
 2017-04-11 18:00:57 +02:00
Emile Vauge
c469bbb70c Merge pull request #1401 from containous/fix-postloadconfig-acme 
Fix postloadconfig acme & Docker filter empty rule
 2017-04-11 17:56:38 +02:00
Emile Vauge
b3e6c7f598 Fix Docker filter empty rule 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-07 16:30:57 +02:00
Emile Vauge
40afd641a9 Fix postLoadConfig 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-04-07 15:48:58 +02:00
Emile Vauge
fba3db5291 Merge pull request #1349 from containous/prepare-release-v1.2.1 
Prepare release v1.2.1
v1.2.1 		2017-03-27 17:08:32 +02:00
Emile Vauge
023cda1398 Prepare release v1.2.1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-27 15:45:00 +02:00
Emile Vauge
3cf6d7e9e5 Merge pull request #1347 from containous/bump-lego-0e2937900 
bump lego 0e2937900
 2017-03-27 15:41:36 +02:00
Emile Vauge
0d657a09b0 bump lego 0e2937900 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-27 14:39:14 +02:00
Emile Vauge
07176396e2 Merge pull request #1331 from containous/k8s-fix-logging-when-objects-are-missing 
k8s: Do not log service fields when GetService is failing.
 2017-03-24 09:32:30 +01:00
Timo Reimann
5183c98fb7 k8s: Do not log service fields when GetService is failing. 
Update tests too.
 2017-03-22 18:59:39 +01:00
Emile Vauge
5a57515c6b Merge pull request #1318 from containous/prepare-release-v1.2.0 
Prepare release v1.2.0
v1.2.0 		2017-03-21 10:37:24 +01:00
Emile Vauge
3490b9d35d Prepare release v1.2.0 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-20 23:26:52 +01:00
Emile Vauge
dd0a20a668 Merge pull request #1304 from Yshayy/filter-non-running-tasks 
Add filter on task status in addition to desired status (Docker Provider - swarm)
 2017-03-20 19:28:10 +01:00
Emile Vauge
d13cef6ff6 sub-tests + Fatalf/Errorf 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-20 17:54:09 +01:00
Emile Vauge
9f149977d6 Add Docker task list test 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-20 12:36:49 +01:00
yshay
e65544f414 Add check on task status in addition to desired status 2017-03-20 12:12:53 +01:00
Sebastian
8010758b29 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-03-19 18:40:09 +01:00
Regner Blok-Andersen
75d92c6967 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-03-17 16:34:34 +01:00
Emile Vauge
0f67cc7818 Merge pull request #1291 from containous/small-fixes 
Small fixes
 2017-03-15 18:04:41 +01:00
Emile Vauge
f428a752a5 Refactor k8s client config 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-15 15:24:01 +01:00
Emile Vauge
3fe3784b6c Removed unused log 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-15 15:24:01 +01:00
Emile Vauge
e4d63331cf Fix default config in generic Mesos provider 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-15 15:24:01 +01:00
Vincent Demeester
8ae521db64 Merge pull request #1278 from akanto/update-oxy 
Update Oxy, fix for #1199
 2017-03-15 15:22:35 +01:00
Timo Reimann
24fde36b20 Revert "Pass context to ListReleases when checking for new versions." 
This reverts commit 07db6a2df1.
 2017-03-15 11:01:47 +01:00
Timo Reimann
7c55a4fd0c Update github.com/containous/oxy only. 2017-03-15 11:01:43 +01:00
Timo Reimann
7b1c0a97f7 Reset glide files to versions from upstream/v1.2. 2017-03-15 10:41:10 +01:00
Attila Kanto
8392846bd4 Update vulcand and pin deps in glide.yaml 2017-03-15 06:59:34 +01:00
Timo Reimann
07db6a2df1 Pass context to ListReleases when checking for new versions. 
Required by go-github update.
 2017-03-15 06:59:34 +01:00
Emile Vauge
cc9bb4b1f8 Merge pull request #1285 from timoreimann/rename-healthcheck-url-to-path 
Rename health check URL parameter to path.
 2017-03-14 23:39:24 +01:00
Timo Reimann
de91b99639 Rename health check URL parameter to path. 
Also improve documentation.
 2017-03-14 01:53:24 +01:00
Timo Reimann
c582ea5ff0 Merge pull request #1258 from matevzmihalic/fix/metrics 
Fix metrics registering
 2017-03-11 07:37:24 +01:00
Matevz Mihalic
b5de37e722 Fix metrics registering 2017-03-10 21:26:34 +01:00
Emile Vauge
ee9032f0bf Merge pull request #1209 from owen/ecs-chunk-taskarns 
Chunk taskArns into groups of 100
 2017-03-09 15:55:42 +01:00
Owen Marshall
11a68ce7f9 Chunk taskArns into groups of 100 
If the ECS cluster has > 100 tasks, passing them to
ecs.DescribeTasksRequest() will result in the AWS API returning
errors.

This patch breaks them into chunks of at most 100, and calls
DescribeTasks for each chunk.

We also return early in case ListTasks returns no values; this
prevents DescribeTasks from throwing HTTP errors.
 2017-03-07 20:52:33 -05:00
Emile Vauge
0dbac0af0d Merge pull request #1239 from timoreimann/update-maxidleconnsperhost-default-in-docs 
Update DefaultMaxIdleConnsPerHost default in docs.
 2017-03-07 15:20:07 +01:00
Timo Reimann
9541ee4cf6 Docs: Update default value for DefaultMaxIdleConnsPerHost. 2017-03-06 21:26:33 +01:00
Emile Vauge
2958a67ce5 Merge pull request #1225 from dtomcej/fix-670 
Update WSS/WS Proto [Fixes #670]
 2017-03-02 23:51:48 +01:00
dtomcej
eebbf6ebbb update oxy hash 2017-03-02 14:59:19 -07:00
Vincent Demeester
0133178b84 Merge pull request #1219 from SantoDE/feature-bump-gorancher 
Bump go-rancher version
 2017-03-02 13:13:44 +01:00
Manuel Laufenberg
9af5ba34ae Bump go-rancher version 2017-03-02 09:39:43 +01:00
Emile Vauge
9b24e13418 Merge pull request #1204 from containous/prepare-release-v1.2.0-rc2 
Prepare release v1.2.0 rc2
v1.2.0-rc2 		2017-03-01 13:54:55 +01:00
Emile Vauge
8fd880a3f1 Prepare release v1.2.0-rc2 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2017-03-01 13:19:08 +01:00
Emile Vauge
89700666b9 Merge pull request #1198 from jangie/revert-1080 
Revert "Ensure that we don't add balancees with no health check runs …
 2017-02-27 21:59:47 +01:00
Bruce Lee
343e0547df Revert "Ensure that we don't add balancees with no health check runs if there is a health check defined on it" 
This reverts commit ad12a7264e.
 2017-02-27 13:56:53 -05:00
Emile Vauge
a7d5e6ce4f Merge pull request #1167 from christopherobin/bugfix-docker 
Fix docker issues with global and dead tasks
 2017-02-23 10:30:20 +01:00
Christophe Robin
d342ae68d8 Add task parser unit test for docker provider 2017-02-22 23:16:33 +01:00
Christophe Robin
a87cd3fc2c Fix docker issues with global and dead tasks 2017-02-22 23:16:33 +01:00