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

937 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ed Robinson
e3a8fd116d
Don't filter the endpoint and service watches 
We added the ability to filter the ingresses used by traefik based
on a label selector, but we shouldn't need to have matching
labels on every other resource, Ingress allready has a way
to explicty choose which pods end up in the load ballancer
(by refering to the membership of a particular service)
 2016-08-16 06:50:50 +01:00
Ed Robinson
d33e09bcf3
Ignore .DS_Store (Mac junk) 2016-08-16 06:50:50 +01:00
Vincent Demeester
fb3bad3887 Merge pull request #619 from jangie/consistent-duration-logging 
Make duration logging consistent
 2016-08-15 18:30:25 +02:00
Bruce Lee
3a736ad4a8 Make duration logging consistent 
GH #559 points out that the logging of the elapsed time is inconsistent
depending on the scale of the measured time; this is due to Duration’s
String handling.

With this PR, I propose that traefik logs millis, and not fractions of
millis.
 2016-08-15 08:43:20 -04:00
Vincent Demeester
c1b0c41769 Merge pull request #609 from cocap10/update-staert-toml-default-pointer-behaviour 
update staert and flaeg
 2016-08-15 13:19:24 +02:00
Martin
c03274703e update staert and flaeg 2016-08-11 14:34:33 +02:00
Christian Winther
4cd08e88f6 Fix Consul prefix (#589) 
Seemed to have been the cause of #587
 2016-08-08 11:53:00 +02:00
Vincent Demeester
e2c4872030 Merge pull request #596 from errm/k8s-server-naming 
Name servers after thier pods
 2016-08-07 09:21:44 +02:00
Ed Robinson
d4f190e995
Name servers after thier pods 
The TargetRef contains information from the object referenced
by the pod, unless the service has been set up with bare
endpoints - i.e. not pointing at pods this information
will be present.

It just makes the information that we show in the web-ui
a little more constent with that shown in kubectl
and the kuberntes dashboard.
 2016-08-06 20:40:40 +01:00
Vincent Demeester
039107e837 Merge pull request #598 from keiths-osc/version_fix 
Fixed binary script so traefik version command doesn't just print default values
 2016-08-05 16:05:25 +02:00
Keith Shook
ef6c211275 Fixed binary script so traefik version command doesn't just print default values 2016-08-05 09:19:45 -04:00
Vincent Demeester
1f3accc0d7 Merge pull request #580 from cocap10/beautify-help 
beautify help
 2016-08-05 15:13:28 +02:00
Martin
2815f80063 beautify help 
and fixes
 2016-08-05 14:26:36 +02:00
Emile Vauge
fa645abee3 Add requirements.txt for netlify (#567) 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-08-05 12:32:49 +02:00
Micaël Mbagira
a86649def3 Upgrade directives name since we use angular-ui-bootstrap (#578) 2016-08-05 11:49:34 +02:00
Vincent Demeester
1fc4c56bc4 Merge pull request #588 from philk/kubernetes-priorities 
Prioritize kubernetes routes by path length
 2016-08-05 11:08:07 +02:00
Phil Kates
79dd72f53d
Prioritize kubernetes routes by path length 
The Kubernetes provider wasn't setting priorities which was causing
shorter paths to get chosen before longer ones. This now matches the
[documentation](https://github.com/containous/traefik/blob/master/docs/basics.md#priorities)
 2016-08-03 11:37:22 -07:00
Andreas Jägle
ffa060ce56 Fix basic docs for configuration of multiple rules (#576) 2016-08-03 18:50:13 +02:00
Emile Vauge
5ce9719951 Merge pull request #557 from stuart-c/insecure_skip_verify 
Add global InsecureSkipVerify option to disable certificate checking
 2016-08-01 15:42:33 +02:00
Stuart Clark
914aa7d372 Add some documentation 2016-07-31 17:08:33 +01:00
Stuart Clark
4a88cbde3a Adjust formatting 2016-07-31 16:59:48 +01:00
Stuart Clark
4882519c0f Add global InsecureSkipVerify option to disable certificate checking 
Signed-off-by: Stuart Clark <stuart.clark@Jahingo.com>
 2016-07-31 16:59:48 +01:00
Vincent Demeester
7abe68fac1 Merge pull request #565 from containous/merge-v1.0.1-master 
Merge v1.0.1 master
 2016-07-28 21:00:13 +02:00
Emile Vauge
e62cca1e7c
Merge v1.0.1 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-28 20:15:09 +02:00
Emile Vauge
a016741918 Merge pull request #547 from containous/add-basic-authentication 
Add basic/digest auth
 2016-07-28 19:01:46 +02:00
Emile Vauge
2f95810fa3
Add experimental Docker push 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-28 18:32:26 +02:00
Emile Vauge
16e2c3b1e0
Add basic/digest auth doc 
Signed-off-by: Emile Vauge <emile@vauge.com>

Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-28 18:32:21 +02:00
Emile Vauge
bc8a92caa9
Add basic/digest auth tests 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-28 18:19:47 +02:00
Emile Vauge
3a5b67a3e1
Add basic/digest auth 
Signed-off-by: Emile Vauge <emile@vauge.com>
 2016-07-28 18:19:47 +02:00
Emile Vauge
2a596b8162 Merge pull request #558 from micaelmbagira/webui-webpack-fountainjs 
Move webui to FountainJS with Webpack
 2016-07-27 22:29:17 +02:00
Micaël
e059239bc3 Move webui to FountainJS with Webpack 2016-07-27 16:16:02 +02:00
Vincent Demeester
986ad9fc57 Merge pull request #551 from cocap10/upload-config-kv 
Add command storeconfig
 2016-07-22 16:52:00 +02:00
Martin
1bb3d9be73 add command storeconfig 
add test integration command storeconfig

update doc
 2016-07-22 15:20:47 +02:00
Emile Vauge
ae31f19ef6 Merge pull request #552 from vdemeester/update-libkermit 
Upgrade libkermit and dependencies
 2016-07-21 19:13:27 +02:00
Vincent Demeester
c170ddc7ae Upgrade libkermit and dependencies 
And use ContainerAPIClient where needed 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 17:43:05 +02:00
Emile Vauge
58b6d92ce2 Merge pull request #553 from vdemeester/move-version-in-package 
Move version.go in its own package…
 2016-07-21 17:35:52 +02:00
Vincent Demeester
87a4d73556
Move version.go in its own package… 
… making it possible to use in other packages ; and thus in the
User-Agent header for the docker client.

Also removing the dockerverion hack as it's not required anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 16:33:49 +02:00
Emile Vauge
4c54a003fa Merge pull request #546 from vdemeester/bump-webui-node 
Bump node to 6 for webui
 2016-07-21 10:46:59 +02:00
Vincent Demeester
a5f3eabf8b Bump node to version 6 for webui 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 10:21:04 +02:00
Emile Vauge
3bf6c59d23 Merge pull request #545 from vdemeester/bump-go-1.6.3 
Bump golang to 1.6.3
 2016-07-21 10:20:33 +02:00
Vincent Demeester
ef83dea95c Bump golang to 1.6.3 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-07-21 09:50:17 +02:00
Vincent Demeester
686c23d25b Merge pull request #481 from cocap10/global-config-kv 
Use KvStores as global config sources
 2016-07-21 09:49:58 +02:00
Martin
b153e90ec5 add createStore() funcs and skip consul TLS test 2016-07-21 09:22:35 +02:00
Martin
38cc36980f update doc 2016-07-21 09:22:35 +02:00
Martin
b83fb525a8 Add TLS support for etcd and consul 2016-07-21 09:22:35 +02:00
Martin
e26e0955b3 add struct ClientTLS : supports either a paths to a file or directly the certificate 2016-07-21 09:22:35 +02:00
Martin
7ada80b619 Certificate can contain path or file contents 
Signed-off-by: Martin <martin.piegay@zenika.com>
 2016-07-21 09:22:35 +02:00
Martin
056e0fe2d9 Use KvStores as global config source 2016-07-21 09:22:35 +02:00
Vincent Demeester
9be0c67d5c Merge pull request #461 from andersbetner/client_tls_auth 
Add endpoint option to authenticate by client tls cert.
 2016-07-21 09:06:34 +02:00
Anders Betnér
664bc9cae0 Added tests for client certificate authentication 2016-07-20 14:41:38 +02:00