baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix default config in generic Mesos provider

Browse source 
Signed-off-by: Emile Vauge <emile@vauge.com>
This commit is contained in:
Emile Vauge 2017-03-14 15:57:49 +01:00
parent b385ffaee7
commit 736f9b30ef
No known key found for this signature in database
GPG key ID: D808B4C167352E59
3 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
configuration.go
View file

@ -408,6 +408,9 @@ func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
defaultMesos.Endpoint = "http://127.0.0.1:5050" defaultMesos.Endpoint = "http://127.0.0.1:5050"
defaultMesos.ExposedByDefault = true defaultMesos.ExposedByDefault = true
defaultMesos.Constraints = types.Constraints{} defaultMesos.Constraints = types.Constraints{}
defaultMesos.RefreshSeconds = 30
defaultMesos.ZkDetectionTimeout = 30
defaultMesos.StateTimeoutSecond = 30
//default ECS //default ECS
var defaultECS provider.ECS var defaultECS provider.ECS

5
docs/toml.md
View file

@ -1050,12 +1050,14 @@ domain = "mesos.localhost"
# Zookeeper timeout (in seconds) # Zookeeper timeout (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# ZkDetectionTimeout = 30 # ZkDetectionTimeout = 30
# Polling interval (in seconds) # Polling interval (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# RefreshSeconds = 30 # RefreshSeconds = 30
@ -1068,8 +1070,9 @@ domain = "mesos.localhost"
# HTTP Timeout (in seconds) # HTTP Timeout (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# StateTimeoutSecond = "host" # StateTimeoutSecond = "30"
``` ```
## Kubernetes Ingress backend ## Kubernetes Ingress backend

5
traefik.sample.toml
View file

@ -654,12 +654,14 @@
# Zookeeper timeout (in seconds) # Zookeeper timeout (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# ZkDetectionTimeout = 30 # ZkDetectionTimeout = 30
# Polling interval (in seconds) # Polling interval (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# RefreshSeconds = 30 # RefreshSeconds = 30
@ -672,8 +674,9 @@
# HTTP Timeout (in seconds) # HTTP Timeout (in seconds)
# #
# Optional # Optional
# Default: 30
# #
# StateTimeoutSecond = "host" # StateTimeoutSecond = "30"
################################################################ ################################################################
# Kubernetes Ingress configuration backend # Kubernetes Ingress configuration backend