Attilio Borello
21aa0ea2da
added DOCKER_VERSION variable
2017-05-16 14:33:06 +02:00
Timo Reimann
f8e7b5595b
Merge pull request #1585 from timoreimann/1-3-maintain-sticky-flag-on-lb-method-validation-failure
...
Maintain sticky flag on LB method validation failure.
2017-05-16 00:41:15 +02:00
Timo Reimann
f9839f7b1d
Turn configureBackends into method.
2017-05-16 00:06:42 +02:00
Timo Reimann
2c45428c8a
Maintain sticky flag on LB method validation failure.
...
We previously did not copy the sticky flag if the load-balancer
method validation failed, causing enabled stickiness to be dropped in
case of a validation error (which, technically, for us is the same as a
load-balancer configuration without an explicitly set method). This
change fixes that.
A few refactorings and improvements along the way:
- Move the frontend and backend configuration steps into separate
methods/functions for better testability.
- Include the invalid method name in the error value and avoid log
duplication.
- Add tests for the backend configuration part.
2017-05-16 00:06:42 +02:00
Emile Vauge
30aa5a82b3
Merge pull request #1577 from aantono/Issue1569
...
Fixed ReplacePath rule executing out of order, when combined with PathPrefixStrip
2017-05-15 23:21:53 +02:00
Alex Antonov
3f68e382fd
Fixed ReplacePath rule executing out of order, when combined with PathPrefixStrip #1569
2017-05-15 10:08:18 -05:00
Emile Vauge
9e57a283d7
Merge pull request #1601 from containous/fix-fatal-auth
...
Fix empty basic auth
2017-05-15 17:00:52 +02:00
Emile Vauge
eaedc1b924
Fix empty basic auth
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-15 16:03:46 +02:00
Emile Vauge
e3ab4e4d63
Merge pull request #1598 from containous/fix-stats-hijack
...
Fix stats hijack
2017-05-15 15:04:23 +02:00
Emile Vauge
48a91d05b5
Add Recover tests
2017-05-15 09:17:33 +02:00
Emile Vauge
111251da05
Adds Panic Recover middleware
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-15 09:17:33 +02:00
Emile Vauge
71cec1580b
Fix stats responseRecorder Hijacker
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-15 09:17:33 +02:00
Emile Vauge
ffe1104851
Merge pull request #1588 from containous/fix-exported-fields-providers
...
Fix exported fields providers
2017-05-11 22:58:00 +02:00
Emile Vauge
aa4ed088bb
Unexport Kvclient & StoreType from kv Provider
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-11 19:33:32 +02:00
Emile Vauge
3a4ec19817
Add missing description tag
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-11 19:33:32 +02:00
Timo Reimann
d2b204a075
Merge pull request #1581 from timoreimann/1-3-kubernetes-ignore-missing-pass-host-header-annotation
...
[Kubernetes] Ignore missing pass host header annotation. [v1.3 - CHERRY-PICK]
2017-05-11 17:43:14 +02:00
Timo Reimann
fe6c35bc6b
[Kubernetes] Ignore missing pass host header annotation.
...
A missing annotation would previously be handled in the default error
case, causing a noisy warning-level log message to be generated each
time.
We add another case statement to ignore the case where the annotation is
missing from the annotations map.
Also piggybacking a minor improvement to the log message.
2017-05-10 19:32:45 +02:00
Ludovic Fernandez
3fd6da06e0
Merge pull request #1556 from atbore-phx/hf-travis
...
[CI ] to run once travis before_deploy
2017-05-05 15:19:55 +02:00
Attilio Borello
95502aeec3
hot fix for release, travis runs before_deploy for each provider! we add a condition to run once
2017-05-05 14:17:08 +02:00
Ludovic Fernandez
58c786ca8c
Merge pull request #1552 from atbore-phx/new-ci
...
[CI] Add SemaphoreCI
2017-05-05 09:33:43 +02:00
Attilio Borello
b6916d2f8c
added initial ci conf
2017-05-04 22:04:20 +02:00
Ludovic Fernandez
840c131a98
Merge pull request #1546 from atbore-phx/rf-travis-ci
...
[CI] Enhance cross-binary builds and parallelism
2017-05-04 21:28:10 +02:00
Attilio Borello
219bcec40f
crossbinary default is now executed before deploy using multiple make jobs in parallel
2017-05-04 20:23:48 +02:00
Ludovic Fernandez
ccda550ab1
Merge pull request #1553 from containous/prepare-release-v1.3.0-rc1
...
Prepare release v1.3.0-rc1
2017-05-04 20:15:20 +02:00
Emile Vauge
b5e73cfa07
Prepare release v1.3.0-rc1
2017-05-04 18:17:54 +02:00
Emile Vauge
ba928dd459
Merge pull request #1241 from vholovko/healthcheck_changes
...
using more sensible consul blocking query to detect health check changes
2017-05-04 17:25:12 +02:00
Volodymyr Holovko
6fd40dbaa9
Using more sensible consul blocking query to detect health check changes
2017-05-04 16:54:27 +02:00
Ludovic Fernandez
6ad273b9fa
Merge pull request #1542 from maxwo/working-ui
...
Working UI
2017-05-04 02:38:45 +02:00
Maxime Wojtczak
5500658f5a
feat(UI) : Working UI.
...
chore(Build) : Add Babel for build.
chore(Babel) : Add babel configuration.
style(Code) : Enhance code style.
2017-05-04 01:12:46 +02:00
Ludovic Fernandez
b4f9e3890f
Merge pull request #1535 from atbore-phx/crossbinary-parallel
...
Makefile target to enable parallel jobs
2017-05-04 00:47:38 +02:00
Attilio Borello
df6741aeeb
Makefile target to enable parallel jobs
...
- fixed dependencies order and renamed Makefile target
- extracted docker run params into DOCKER_RUN_OPTS
- crossbinary-default contains 64bit Linux, Win and Darwin
- crossbinary-others contains 32bit Linux, Win, Darwin and 32/64bit *bsd
- added dependencies to crossbinary-default and crossbinary-others targets
2017-05-04 00:02:45 +02:00
Ludovic Fernandez
5535318cda
Merge pull request #1538 from containous/merge-v1.2.3-master
...
Merge v1.2.3 master
2017-05-03 23:49:47 +02:00
Emile Vauge
4e186cecf9
Merge v1.2.3 master
2017-05-03 23:24:53 +02:00
Emile Vauge
8ac281f9e3
Prepare release v1.2.3
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-03 22:53:58 +02:00
Emile Vauge
e7a73d3fb3
Fix too many redirect
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-03 22:53:58 +02:00
Emile Vauge
ca9e36ebe3
Prepare release v1.2.2
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-03 22:53:58 +02:00
Adam Geiger
138fea17ed
Fix redirect empty backend
...
Issue-#679
2017-05-03 22:53:58 +02:00
Emile Vauge
bf3f6e2029
Fix Docker filter empty rule
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-03 22:53:58 +02:00
Emile Vauge
ec245d604a
Fix postLoadConfig
...
Signed-off-by: Emile Vauge <emile@vauge.com>
2017-05-03 22:53:58 +02:00
Emile Vauge
69e081f40f
Merge pull request #1541 from containous/revert-73a1b17
...
Revert "First stage of access logging middleware. Initially without …
2017-05-03 19:35:49 +02:00
Emile Vauge
82651985c4
Revert "First stage of access logging middleware. Initially without any output appenders."
...
This reverts commit 73a1b172ed
.
2017-05-03 17:30:31 +02:00
Ludovic Fernandez
a5384bae47
Merge pull request #1540 from containous/marathon-add-tests-lost-during-1320-rebase
...
Add tests lost during PR 1320.
2017-05-03 17:15:10 +02:00
Timo Reimann
1dcf8d2ea6
Add tests lost during PR 1320.
...
The tests part of this change were originally in PR 1320 but got lost
during one of the rebases. Let's bring them back in.
2017-05-03 16:27:21 +02:00
Ludovic Fernandez
e86df016c3
Merge pull request #1537 from ldez/refactor-git-alias-safe
...
refactor: fix for PR with master branch.
2017-05-03 16:24:38 +02:00
Fernandez Ludovic
72baf746f4
refactor: fix for PR with master branch.
2017-05-03 15:54:43 +02:00
Ludovic Fernandez
91b4b47f04
Merge pull request #1523 from tanyadegurechaff/make-port-deterministic
...
Make port deterministic
2017-05-03 15:53:46 +02:00
tanyadegurechaff
79cbe56a41
Make port deterministic
2017-05-03 15:28:53 +02:00
Ludovic Fernandez
f621d7a2c4
Merge pull request #1525 from guilhem/fix-watchdog
...
Fix systemd watchdog feature
2017-05-03 15:25:15 +02:00
Guilhem Lettron
3c33eab35e
Fix systemd watchdog feature
...
Commit coreos/go-systemd@0c088e introduce cleaning environment.
First usage of sdnotify (for type=notify) was clearing NOTIFY_SOCKET environment variable.
sdnotify in watchdog was unable to ping back.
Fix #1353
2017-05-03 14:44:51 +02:00
Ludovic Fernandez
b67a27d0c7
Merge pull request #1527 from yyekhlef/master
...
feat(rancher): added constraint management for rancher provider
2017-05-03 14:32:01 +02:00