From cf0759a48f6c4192151bf1a410edd59f8499a91d Mon Sep 17 00:00:00 2001 From: Romain Date: Mon, 21 Jun 2021 11:54:08 +0200 Subject: [PATCH] Update documentation references --- docs/content/reference/dynamic-configuration/kv-ref.md | 2 ++ docs/content/reference/static-configuration/cli-ref.md | 3 +++ docs/content/reference/static-configuration/env-ref.md | 3 +++ docs/content/reference/static-configuration/file.toml | 3 +-- docs/content/reference/static-configuration/file.yaml | 4 +--- pkg/config/static/static_config.go | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/docs/content/reference/dynamic-configuration/kv-ref.md b/docs/content/reference/dynamic-configuration/kv-ref.md index ff4d87835..170798ed0 100644 --- a/docs/content/reference/dynamic-configuration/kv-ref.md +++ b/docs/content/reference/dynamic-configuration/kv-ref.md @@ -168,6 +168,7 @@ | `traefik/http/serversTransports/ServersTransport0/certificates/0/keyFile` | `foobar` | | `traefik/http/serversTransports/ServersTransport0/certificates/1/certFile` | `foobar` | | `traefik/http/serversTransports/ServersTransport0/certificates/1/keyFile` | `foobar` | +| `traefik/http/serversTransports/ServersTransport0/disableHTTP2` | `true` | | `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/dialTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/idleConnTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/responseHeaderTimeout` | `42s` | @@ -180,6 +181,7 @@ | `traefik/http/serversTransports/ServersTransport1/certificates/0/keyFile` | `foobar` | | `traefik/http/serversTransports/ServersTransport1/certificates/1/certFile` | `foobar` | | `traefik/http/serversTransports/ServersTransport1/certificates/1/keyFile` | `foobar` | +| `traefik/http/serversTransports/ServersTransport1/disableHTTP2` | `true` | | `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/dialTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/idleConnTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/responseHeaderTimeout` | `42s` | diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md index 4d8628cc7..6733467c8 100644 --- a/docs/content/reference/static-configuration/cli-ref.md +++ b/docs/content/reference/static-configuration/cli-ref.md @@ -720,6 +720,9 @@ Display additional provider logs. (Default: ```false```) `--providers.marathon.watch`: Watch provider. (Default: ```true```) +`--providers.plugin.`: +Plugins configuration. + `--providers.providersthrottleduration`: Backends throttle duration: minimum duration between 2 events from providers before applying a new configuration. It avoids unnecessary reloads if multiples events are sent in a short amount of time. (Default: ```2```) diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md index 85cbe0106..f5ce04332 100644 --- a/docs/content/reference/static-configuration/env-ref.md +++ b/docs/content/reference/static-configuration/env-ref.md @@ -720,6 +720,9 @@ Display additional provider logs. (Default: ```false```) `TRAEFIK_PROVIDERS_MARATHON_WATCH`: Watch provider. (Default: ```true```) +`TRAEFIK_PROVIDERS_PLUGIN_`: +Plugins configuration. + `TRAEFIK_PROVIDERS_PROVIDERSTHROTTLEDURATION`: Backends throttle duration: minimum duration between 2 events from providers before applying a new configuration. It avoids unnecessary reloads if multiples events are sent in a short amount of time. (Default: ```2```) diff --git a/docs/content/reference/static-configuration/file.toml b/docs/content/reference/static-configuration/file.toml index 361b8ef3f..92d9ba767 100644 --- a/docs/content/reference/static-configuration/file.toml +++ b/docs/content/reference/static-configuration/file.toml @@ -389,6 +389,7 @@ [experimental] kubernetesGateway = true + http3 = true [experimental.plugins] [experimental.plugins.Descriptor0] moduleName = "foobar" @@ -399,5 +400,3 @@ [experimental.devPlugin] goPath = "foobar" moduleName = "foobar" - http3 = true - kubernetesGateway = true diff --git a/docs/content/reference/static-configuration/file.yaml b/docs/content/reference/static-configuration/file.yaml index fa49b9db3..0ac2decbf 100644 --- a/docs/content/reference/static-configuration/file.yaml +++ b/docs/content/reference/static-configuration/file.yaml @@ -409,6 +409,7 @@ pilot: token: foobar experimental: kubernetesGateway: true + http3: true plugins: Descriptor0: moduleName: foobar @@ -419,6 +420,3 @@ experimental: devPlugin: goPath: foobar moduleName: foobar - http3: true - kubernetesGateway: true - diff --git a/pkg/config/static/static_config.go b/pkg/config/static/static_config.go index a1aaaa60f..dacabfcc1 100644 --- a/pkg/config/static/static_config.go +++ b/pkg/config/static/static_config.go @@ -191,7 +191,7 @@ type Providers struct { Redis *redis.Provider `description:"Enable Redis backend with default settings." json:"redis,omitempty" toml:"redis,omitempty" yaml:"redis,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` HTTP *http.Provider `description:"Enable HTTP backend with default settings." json:"http,omitempty" toml:"http,omitempty" yaml:"http,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"` - Plugin map[string]PluginConf `description:"" json:"plugin,omitempty" toml:"plugin,omitempty" yaml:"plugin,omitempty"` + Plugin map[string]PluginConf `description:"Plugins configuration." json:"plugin,omitempty" toml:"plugin,omitempty" yaml:"plugin,omitempty"` } // SetEffectiveConfiguration adds missing configuration parameters derived from existing ones.