From 0e532a3634a15e516134da723e4a945d1343d6e0 Mon Sep 17 00:00:00 2001 From: Ludovic Fernandez Date: Wed, 6 Apr 2022 11:06:08 +0200 Subject: [PATCH] Update dynamic and static configuration references --- .../dynamic-configuration/docker-labels.yml | 8 +- .../reference/dynamic-configuration/file.toml | 18 +- .../reference/dynamic-configuration/file.yaml | 320 +++++++++--------- .../reference/dynamic-configuration/kv-ref.md | 14 +- .../marathon-labels.json | 11 +- .../reference/static-configuration/file.toml | 74 ++-- .../reference/static-configuration/file.yaml | 152 +++++---- pkg/config/dynamic/tcp_middlewares.go | 2 +- 8 files changed, 320 insertions(+), 279 deletions(-) diff --git a/docs/content/reference/dynamic-configuration/docker-labels.yml b/docs/content/reference/dynamic-configuration/docker-labels.yml index ee2f33122..1bbfb0eee 100644 --- a/docs/content/reference/dynamic-configuration/docker-labels.yml +++ b/docs/content/reference/dynamic-configuration/docker-labels.yml @@ -56,6 +56,7 @@ - "traefik.http.middlewares.middleware10.headers.framedeny=true" - "traefik.http.middlewares.middleware10.headers.hostsproxyheaders=foobar, foobar" - "traefik.http.middlewares.middleware10.headers.isdevelopment=true" +- "traefik.http.middlewares.middleware10.headers.permissionspolicy=foobar" - "traefik.http.middlewares.middleware10.headers.publickey=foobar" - "traefik.http.middlewares.middleware10.headers.referrerpolicy=foobar" - "traefik.http.middlewares.middleware10.headers.sslforcehost=true" @@ -153,6 +154,7 @@ - "traefik.http.services.service01.loadbalancer.healthcheck.followredirects=true" - "traefik.http.services.service01.loadbalancer.passhostheader=true" - "traefik.http.services.service01.loadbalancer.responseforwarding.flushinterval=foobar" +- "traefik.http.services.service01.loadbalancer.serverstransport=foobar" - "traefik.http.services.service01.loadbalancer.sticky.cookie=true" - "traefik.http.services.service01.loadbalancer.sticky.cookie.httponly=true" - "traefik.http.services.service01.loadbalancer.sticky.cookie.name=foobar" @@ -160,8 +162,8 @@ - "traefik.http.services.service01.loadbalancer.sticky.cookie.secure=true" - "traefik.http.services.service01.loadbalancer.server.port=foobar" - "traefik.http.services.service01.loadbalancer.server.scheme=foobar" -- "traefik.http.services.service01.loadbalancer.serverstransport=foobar" -- "traefik.tcp.middlewares.middleware00.ipwhitelist.sourcerange=foobar, foobar" +- "traefik.tcp.middlewares.tcpmiddleware00.ipwhitelist.sourcerange=foobar, foobar" +- "traefik.tcp.middlewares.tcpmiddleware01.inflightconn.amount=42" - "traefik.tcp.routers.tcprouter0.entrypoints=foobar, foobar" - "traefik.tcp.routers.tcprouter0.middlewares=foobar, foobar" - "traefik.tcp.routers.tcprouter0.rule=foobar" @@ -186,9 +188,9 @@ - "traefik.tcp.routers.tcprouter1.tls.domains[1].sans=foobar, foobar" - "traefik.tcp.routers.tcprouter1.tls.options=foobar" - "traefik.tcp.routers.tcprouter1.tls.passthrough=true" +- "traefik.tcp.services.tcpservice01.loadbalancer.proxyprotocol.version=42" - "traefik.tcp.services.tcpservice01.loadbalancer.terminationdelay=42" - "traefik.tcp.services.tcpservice01.loadbalancer.server.port=foobar" -- "traefik.tcp.services.tcpservice01.loadbalancer.proxyprotocol.version=42" - "traefik.udp.routers.udprouter0.entrypoints=foobar, foobar" - "traefik.udp.routers.udprouter0.service=foobar" - "traefik.udp.routers.udprouter1.entrypoints=foobar, foobar" diff --git a/docs/content/reference/dynamic-configuration/file.toml b/docs/content/reference/dynamic-configuration/file.toml index 0aad383d6..d3e907b8c 100644 --- a/docs/content/reference/dynamic-configuration/file.toml +++ b/docs/content/reference/dynamic-configuration/file.toml @@ -180,6 +180,7 @@ publicKey = "foobar" referrerPolicy = "foobar" featurePolicy = "foobar" + permissionsPolicy = "foobar" isDevelopment = true [http.middlewares.Middleware10.headers.customRequestHeaders] name0 = "foobar" @@ -237,7 +238,7 @@ [http.middlewares.Middleware15] [http.middlewares.Middleware15.rateLimit] average = 42 - period = 42 + period = "42s" burst = 42 [http.middlewares.Middleware15.rateLimit.sourceCriterion] requestHeaderName = "foobar" @@ -265,7 +266,7 @@ [http.middlewares.Middleware20] [http.middlewares.Middleware20.retry] attempts = 42 - initialInterval = 42 + initialInterval = "42s" [http.middlewares.Middleware21] [http.middlewares.Middleware21.stripPrefix] prefixes = ["foobar", "foobar"] @@ -293,6 +294,8 @@ dialTimeout = "42s" responseHeaderTimeout = "42s" idleConnTimeout = "42s" + readIdleTimeout = "42s" + pingTimeout = "42s" [http.serversTransports.ServersTransport1] serverName = "foobar" insecureSkipVerify = true @@ -312,6 +315,8 @@ dialTimeout = "42s" responseHeaderTimeout = "42s" idleConnTimeout = "42s" + readIdleTimeout = "42s" + pingTimeout = "42s" [tcp] [tcp.routers] @@ -372,9 +377,12 @@ name = "foobar" weight = 42 [tcp.middlewares] - [tcp.middlewares.Middleware00] - [tcp.middlewares.Middleware00.ipWhiteList] - sourceRange = ["foobar", "foobar"] + [tcp.middlewares.TCPMiddleware00] + [tcp.middlewares.TCPMiddleware00.ipWhiteList] + sourceRange = ["foobar", "foobar"] + [tcp.middlewares.TCPMiddleware01] + [tcp.middlewares.TCPMiddleware01.inFlightConn] + amount = 42 [udp] [udp.routers] diff --git a/docs/content/reference/dynamic-configuration/file.yaml b/docs/content/reference/dynamic-configuration/file.yaml index 846e9ea2c..d0d7b6fa3 100644 --- a/docs/content/reference/dynamic-configuration/file.yaml +++ b/docs/content/reference/dynamic-configuration/file.yaml @@ -2,11 +2,11 @@ http: routers: Router0: entryPoints: - - foobar - - foobar + - foobar + - foobar middlewares: - - foobar - - foobar + - foobar + - foobar service: foobar rule: foobar priority: 42 @@ -14,21 +14,21 @@ http: options: foobar certResolver: foobar domains: - - main: foobar - sans: - - foobar - - foobar - - main: foobar - sans: - - foobar - - foobar + - main: foobar + sans: + - foobar + - foobar + - main: foobar + sans: + - foobar + - foobar Router1: entryPoints: - - foobar - - foobar + - foobar + - foobar middlewares: - - foobar - - foobar + - foobar + - foobar service: foobar rule: foobar priority: 42 @@ -36,14 +36,14 @@ http: options: foobar certResolver: foobar domains: - - main: foobar - sans: - - foobar - - foobar - - main: foobar - sans: - - foobar - - foobar + - main: foobar + sans: + - foobar + - foobar + - main: foobar + sans: + - foobar + - foobar services: Service01: loadBalancer: @@ -54,8 +54,8 @@ http: httpOnly: true sameSite: foobar servers: - - url: foobar - - url: foobar + - url: foobar + - url: foobar healthCheck: scheme: foobar path: foobar @@ -77,18 +77,18 @@ http: maxBodySize: 42 healthCheck: {} mirrors: - - name: foobar - percent: 42 - - name: foobar - percent: 42 + - name: foobar + percent: 42 + - name: foobar + percent: 42 Service03: weighted: healthCheck: {} services: - - name: foobar - weight: 42 - - name: foobar - weight: 42 + - name: foobar + weight: 42 + - name: foobar + weight: 42 sticky: cookie: name: foobar @@ -102,8 +102,8 @@ http: Middleware01: basicAuth: users: - - foobar - - foobar + - foobar + - foobar usersFile: foobar realm: foobar removeHeader: true @@ -118,16 +118,16 @@ http: Middleware03: chain: middlewares: - - foobar - - foobar + - foobar + - foobar Middleware04: circuitBreaker: expression: foobar Middleware05: compress: excludedContentTypes: - - foobar - - foobar + - foobar + - foobar minResponseBodyBytes: 42 Middleware06: contentType: @@ -135,8 +135,8 @@ http: Middleware07: digestAuth: users: - - foobar - - foobar + - foobar + - foobar usersFile: foobar removeHeader: true realm: foobar @@ -144,8 +144,8 @@ http: Middleware08: errors: status: - - foobar - - foobar + - foobar + - foobar service: foobar query: foobar Middleware09: @@ -159,12 +159,12 @@ http: insecureSkipVerify: true trustForwardHeader: true authResponseHeaders: - - foobar - - foobar + - foobar + - foobar authResponseHeadersRegex: foobar authRequestHeaders: - - foobar - - foobar + - foobar + - foobar Middleware10: headers: customRequestHeaders: @@ -175,28 +175,28 @@ http: name1: foobar accessControlAllowCredentials: true accessControlAllowHeaders: - - foobar - - foobar + - foobar + - foobar accessControlAllowMethods: - - foobar - - foobar + - foobar + - foobar accessControlAllowOriginList: - - foobar - - foobar + - foobar + - foobar accessControlAllowOriginListRegex: - - foobar - - foobar + - foobar + - foobar accessControlExposeHeaders: - - foobar - - foobar + - foobar + - foobar accessControlMaxAge: 42 addVaryHeader: true allowedHosts: - - foobar - - foobar + - foobar + - foobar hostsProxyHeaders: - - foobar - - foobar + - foobar + - foobar sslRedirect: true sslTemporaryRedirect: true sslHost: foobar @@ -217,17 +217,18 @@ http: publicKey: foobar referrerPolicy: foobar featurePolicy: foobar + permissionsPolicy: foobar isDevelopment: true Middleware11: ipWhiteList: sourceRange: - - foobar - - foobar + - foobar + - foobar ipStrategy: depth: 42 excludedIPs: - - foobar - - foobar + - foobar + - foobar Middleware12: inFlightReq: amount: 42 @@ -235,8 +236,8 @@ http: ipStrategy: depth: 42 excludedIPs: - - foobar - - foobar + - foobar + - foobar requestHeaderName: foobar requestHost: true Middleware13: @@ -271,14 +272,14 @@ http: Middleware15: rateLimit: average: 42 - period: 42 + period: 42s burst: 42 sourceCriterion: ipStrategy: depth: 42 excludedIPs: - - foobar - - foobar + - foobar + - foobar requestHeaderName: foobar requestHost: true Middleware16: @@ -301,64 +302,68 @@ http: Middleware20: retry: attempts: 42 - initialInterval: 42 + initialInterval: 42s Middleware21: stripPrefix: prefixes: - - foobar - - foobar + - foobar + - foobar forceSlash: true Middleware22: stripPrefixRegex: regex: - - foobar - - foobar + - foobar + - foobar serversTransports: ServersTransport0: serverName: foobar insecureSkipVerify: true rootCAs: - - foobar - - foobar + - foobar + - foobar certificates: - - certFile: foobar - keyFile: foobar - - certFile: foobar - keyFile: foobar + - certFile: foobar + keyFile: foobar + - certFile: foobar + keyFile: foobar maxIdleConnsPerHost: 42 forwardingTimeouts: dialTimeout: 42s responseHeaderTimeout: 42s idleConnTimeout: 42s + readIdleTimeout: 42s + pingTimeout: 42s disableHTTP2: true peerCertURI: foobar ServersTransport1: serverName: foobar insecureSkipVerify: true rootCAs: - - foobar - - foobar + - foobar + - foobar certificates: - - certFile: foobar - keyFile: foobar - - certFile: foobar - keyFile: foobar + - certFile: foobar + keyFile: foobar + - certFile: foobar + keyFile: foobar maxIdleConnsPerHost: 42 forwardingTimeouts: dialTimeout: 42s responseHeaderTimeout: 42s idleConnTimeout: 42s + readIdleTimeout: 42s + pingTimeout: 42s disableHTTP2: true peerCertURI: foobar tcp: routers: TCPRouter0: entryPoints: - - foobar - - foobar + - foobar + - foobar middlewares: - - foobar - - foobar + - foobar + - foobar service: foobar rule: foobar tls: @@ -366,21 +371,21 @@ tcp: options: foobar certResolver: foobar domains: - - main: foobar - sans: - - foobar - - foobar - - main: foobar - sans: - - foobar - - foobar + - main: foobar + sans: + - foobar + - foobar + - main: foobar + sans: + - foobar + - foobar TCPRouter1: entryPoints: - - foobar - - foobar + - foobar + - foobar middlewares: - - foobar - - foobar + - foobar + - foobar service: foobar rule: foobar tls: @@ -388,20 +393,14 @@ tcp: options: foobar certResolver: foobar domains: - - main: foobar - sans: - - foobar - - foobar - - main: foobar - sans: - - foobar - - foobar - middlewares: - Middleware00: - ipWhiteList: - sourceRange: - - foobar - - foobar + - main: foobar + sans: + - foobar + - foobar + - main: foobar + sans: + - foobar + - foobar services: TCPService01: loadBalancer: @@ -409,66 +408,75 @@ tcp: proxyProtocol: version: 42 servers: - - address: foobar - - address: foobar + - address: foobar + - address: foobar TCPService02: weighted: services: - - name: foobar - weight: 42 - - name: foobar - weight: 42 + - name: foobar + weight: 42 + - name: foobar + weight: 42 + middlewares: + TCPMiddleware00: + ipWhiteList: + sourceRange: + - foobar + - foobar + TCPMiddleware01: + inFlightConn: + amount: 42 udp: routers: UDPRouter0: entryPoints: - - foobar - - foobar + - foobar + - foobar service: foobar UDPRouter1: entryPoints: - - foobar - - foobar + - foobar + - foobar service: foobar services: UDPService01: loadBalancer: servers: - - address: foobar - - address: foobar + - address: foobar + - address: foobar UDPService02: weighted: services: - - name: foobar - weight: 42 - - name: foobar - weight: 42 + - name: foobar + weight: 42 + - name: foobar + weight: 42 tls: certificates: - - certFile: foobar - keyFile: foobar - stores: - - foobar - - foobar - - certFile: foobar - keyFile: foobar - stores: - - foobar - - foobar + - certFile: foobar + keyFile: foobar + stores: + - foobar + - foobar + - certFile: foobar + keyFile: foobar + stores: + - foobar + - foobar options: Options0: minVersion: foobar maxVersion: foobar cipherSuites: - - foobar - - foobar + - foobar + - foobar curvePreferences: - - foobar - - foobar + - foobar + - foobar clientAuth: caFiles: - - foobar - - foobar + - foobar + - foobar clientAuthType: foobar sniStrict: true preferServerCipherSuites: true @@ -479,15 +487,15 @@ tls: minVersion: foobar maxVersion: foobar cipherSuites: - - foobar - - foobar + - foobar + - foobar curvePreferences: - - foobar - - foobar + - foobar + - foobar clientAuth: caFiles: - - foobar - - foobar + - foobar + - foobar clientAuthType: foobar sniStrict: true preferServerCipherSuites: true diff --git a/docs/content/reference/dynamic-configuration/kv-ref.md b/docs/content/reference/dynamic-configuration/kv-ref.md index 0df01e697..ce6bada65 100644 --- a/docs/content/reference/dynamic-configuration/kv-ref.md +++ b/docs/content/reference/dynamic-configuration/kv-ref.md @@ -69,6 +69,7 @@ | `traefik/http/middlewares/Middleware10/headers/hostsProxyHeaders/0` | `foobar` | | `traefik/http/middlewares/Middleware10/headers/hostsProxyHeaders/1` | `foobar` | | `traefik/http/middlewares/Middleware10/headers/isDevelopment` | `true` | +| `traefik/http/middlewares/Middleware10/headers/permissionsPolicy` | `foobar` | | `traefik/http/middlewares/Middleware10/headers/publicKey` | `foobar` | | `traefik/http/middlewares/Middleware10/headers/referrerPolicy` | `foobar` | | `traefik/http/middlewares/Middleware10/headers/sslForceHost` | `true` | @@ -114,7 +115,7 @@ | `traefik/http/middlewares/Middleware14/plugin/PluginConf/foo` | `bar` | | `traefik/http/middlewares/Middleware15/rateLimit/average` | `42` | | `traefik/http/middlewares/Middleware15/rateLimit/burst` | `42` | -| `traefik/http/middlewares/Middleware15/rateLimit/period` | `42` | +| `traefik/http/middlewares/Middleware15/rateLimit/period` | `42s` | | `traefik/http/middlewares/Middleware15/rateLimit/sourceCriterion/ipStrategy/depth` | `42` | | `traefik/http/middlewares/Middleware15/rateLimit/sourceCriterion/ipStrategy/excludedIPs/0` | `foobar` | | `traefik/http/middlewares/Middleware15/rateLimit/sourceCriterion/ipStrategy/excludedIPs/1` | `foobar` | @@ -130,7 +131,7 @@ | `traefik/http/middlewares/Middleware19/replacePathRegex/regex` | `foobar` | | `traefik/http/middlewares/Middleware19/replacePathRegex/replacement` | `foobar` | | `traefik/http/middlewares/Middleware20/retry/attempts` | `42` | -| `traefik/http/middlewares/Middleware20/retry/initialInterval` | `42` | +| `traefik/http/middlewares/Middleware20/retry/initialInterval` | `42s` | | `traefik/http/middlewares/Middleware21/stripPrefix/forceSlash` | `true` | | `traefik/http/middlewares/Middleware21/stripPrefix/prefixes/0` | `foobar` | | `traefik/http/middlewares/Middleware21/stripPrefix/prefixes/1` | `foobar` | @@ -173,6 +174,8 @@ | `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/pingTimeout` | `42s` | +| `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/readIdleTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport0/forwardingTimeouts/responseHeaderTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport0/insecureSkipVerify` | `true` | | `traefik/http/serversTransports/ServersTransport0/maxIdleConnsPerHost` | `42` | @@ -187,6 +190,8 @@ | `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/pingTimeout` | `42s` | +| `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/readIdleTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport1/forwardingTimeouts/responseHeaderTimeout` | `42s` | | `traefik/http/serversTransports/ServersTransport1/insecureSkipVerify` | `true` | | `traefik/http/serversTransports/ServersTransport1/maxIdleConnsPerHost` | `42` | @@ -228,8 +233,9 @@ | `traefik/http/services/Service03/weighted/sticky/cookie/name` | `foobar` | | `traefik/http/services/Service03/weighted/sticky/cookie/sameSite` | `foobar` | | `traefik/http/services/Service03/weighted/sticky/cookie/secure` | `true` | -| `traefik/tcp/middlewares/Middleware00/ipWhiteList/sourceRange/0` | `foobar` | -| `traefik/tcp/middlewares/Middleware00/ipWhiteList/sourceRange/1` | `foobar` | +| `traefik/tcp/middlewares/TCPMiddleware00/ipWhiteList/sourceRange/0` | `foobar` | +| `traefik/tcp/middlewares/TCPMiddleware00/ipWhiteList/sourceRange/1` | `foobar` | +| `traefik/tcp/middlewares/TCPMiddleware01/inFlightConn/amount` | `42` | | `traefik/tcp/routers/TCPRouter0/entryPoints/0` | `foobar` | | `traefik/tcp/routers/TCPRouter0/entryPoints/1` | `foobar` | | `traefik/tcp/routers/TCPRouter0/middlewares/0` | `foobar` | diff --git a/docs/content/reference/dynamic-configuration/marathon-labels.json b/docs/content/reference/dynamic-configuration/marathon-labels.json index 58128731d..bde6068d4 100644 --- a/docs/content/reference/dynamic-configuration/marathon-labels.json +++ b/docs/content/reference/dynamic-configuration/marathon-labels.json @@ -24,9 +24,9 @@ "traefik.http.middlewares.middleware08.errors.service": "foobar", "traefik.http.middlewares.middleware08.errors.status": "foobar, foobar", "traefik.http.middlewares.middleware09.forwardauth.address": "foobar", +"traefik.http.middlewares.middleware09.forwardauth.authrequestheaders": "foobar, foobar", "traefik.http.middlewares.middleware09.forwardauth.authresponseheaders": "foobar, foobar", "traefik.http.middlewares.middleware09.forwardauth.authresponseheadersregex": "foobar", -"traefik.http.middlewares.middleware09.forwardauth.authrequestheaders": "foobar, foobar", "traefik.http.middlewares.middleware09.forwardauth.tls.ca": "foobar", "traefik.http.middlewares.middleware09.forwardauth.tls.caoptional": "true", "traefik.http.middlewares.middleware09.forwardauth.tls.cert": "foobar", @@ -56,6 +56,7 @@ "traefik.http.middlewares.middleware10.headers.framedeny": "true", "traefik.http.middlewares.middleware10.headers.hostsproxyheaders": "foobar, foobar", "traefik.http.middlewares.middleware10.headers.isdevelopment": "true", +"traefik.http.middlewares.middleware10.headers.permissionspolicy": "foobar", "traefik.http.middlewares.middleware10.headers.publickey": "foobar", "traefik.http.middlewares.middleware10.headers.referrerpolicy": "foobar", "traefik.http.middlewares.middleware10.headers.sslforcehost": "true", @@ -153,6 +154,7 @@ "traefik.http.services.service01.loadbalancer.healthcheck.followredirects": "true", "traefik.http.services.service01.loadbalancer.passhostheader": "true", "traefik.http.services.service01.loadbalancer.responseforwarding.flushinterval": "foobar", +"traefik.http.services.service01.loadbalancer.serverstransport": "foobar", "traefik.http.services.service01.loadbalancer.sticky.cookie": "true", "traefik.http.services.service01.loadbalancer.sticky.cookie.httponly": "true", "traefik.http.services.service01.loadbalancer.sticky.cookie.name": "foobar", @@ -160,8 +162,10 @@ "traefik.http.services.service01.loadbalancer.sticky.cookie.secure": "true", "traefik.http.services.service01.loadbalancer.server.port": "foobar", "traefik.http.services.service01.loadbalancer.server.scheme": "foobar", -"traefik.http.services.service01.loadbalancer.serverstransport": "foobar", +"traefik.tcp.middlewares.tcpmiddleware00.ipwhitelist.sourcerange": "foobar, foobar", +"traefik.tcp.middlewares.tcpmiddleware01.inflightconn.amount": "42", "traefik.tcp.routers.tcprouter0.entrypoints": "foobar, foobar", +"traefik.tcp.routers.tcprouter0.middlewares": "foobar, foobar", "traefik.tcp.routers.tcprouter0.rule": "foobar", "traefik.tcp.routers.tcprouter0.service": "foobar", "traefik.tcp.routers.tcprouter0.tls": "true", @@ -173,6 +177,7 @@ "traefik.tcp.routers.tcprouter0.tls.options": "foobar", "traefik.tcp.routers.tcprouter0.tls.passthrough": "true", "traefik.tcp.routers.tcprouter1.entrypoints": "foobar, foobar", +"traefik.tcp.routers.tcprouter1.middlewares": "foobar, foobar", "traefik.tcp.routers.tcprouter1.rule": "foobar", "traefik.tcp.routers.tcprouter1.service": "foobar", "traefik.tcp.routers.tcprouter1.tls": "true", @@ -183,8 +188,8 @@ "traefik.tcp.routers.tcprouter1.tls.domains[1].sans": "foobar, foobar", "traefik.tcp.routers.tcprouter1.tls.options": "foobar", "traefik.tcp.routers.tcprouter1.tls.passthrough": "true", -"traefik.tcp.services.tcpservice01.loadbalancer.terminationdelay": "42", "traefik.tcp.services.tcpservice01.loadbalancer.proxyprotocol.version": "42", +"traefik.tcp.services.tcpservice01.loadbalancer.terminationdelay": "42", "traefik.tcp.services.tcpservice01.loadbalancer.server.port": "foobar", "traefik.udp.routers.udprouter0.entrypoints": "foobar, foobar", "traefik.udp.routers.udprouter0.service": "foobar", diff --git a/docs/content/reference/static-configuration/file.toml b/docs/content/reference/static-configuration/file.toml index a995affa5..ae3216dae 100644 --- a/docs/content/reference/static-configuration/file.toml +++ b/docs/content/reference/static-configuration/file.toml @@ -7,31 +7,27 @@ rootCAs = ["foobar", "foobar"] maxIdleConnsPerHost = 42 [serversTransport.forwardingTimeouts] - dialTimeout = 42 - responseHeaderTimeout = 42 - idleConnTimeout = 42 + dialTimeout = "42s" + responseHeaderTimeout = "42s" + idleConnTimeout = "42s" [entryPoints] [entryPoints.EntryPoint0] address = "foobar" [entryPoints.EntryPoint0.transport] [entryPoints.EntryPoint0.transport.lifeCycle] - requestAcceptGraceTimeout = 42 - graceTimeOut = 42 + requestAcceptGraceTimeout = "42s" + graceTimeOut = "42s" [entryPoints.EntryPoint0.transport.respondingTimeouts] - readTimeout = 42 - writeTimeout = 42 - idleTimeout = 42 + readTimeout = "42s" + writeTimeout = "42s" + idleTimeout = "42s" [entryPoints.EntryPoint0.proxyProtocol] insecure = true trustedIPs = ["foobar", "foobar"] [entryPoints.EntryPoint0.forwardedHeaders] insecure = true trustedIPs = ["foobar", "foobar"] - [entryPoints.EntryPoint0.udp] - timeout = 42 - [entryPoints.EntryPoint0.http3] - advertisedPort = 42 [entryPoints.EntryPoint0.http] middlewares = ["foobar", "foobar"] [entryPoints.EntryPoint0.http.redirections] @@ -51,9 +47,13 @@ [[entryPoints.EntryPoint0.http.tls.domains]] main = "foobar" sans = ["foobar", "foobar"] + [entryPoints.EntryPoint0.http3] + advertisedPort = 42 + [entryPoints.EntryPoint0.udp] + timeout = "42s" [providers] - providersThrottleDuration = 42 + providersThrottleDuration = "42s" [providers.docker] constraints = "foobar" watch = true @@ -63,8 +63,8 @@ useBindPortIP = true swarmMode = true network = "foobar" - swarmModeRefreshSeconds = 42 - httpClientTimeout = 42 + swarmModeRefreshSeconds = "42s" + httpClientTimeout = "42s" [providers.docker.tls] ca = "foobar" caOptional = true @@ -84,10 +84,10 @@ defaultRule = "foobar" exposedByDefault = true dcosToken = "foobar" - dialerTimeout = 42 - responseHeaderTimeout = 42 - tlsHandshakeTimeout = 42 - keepAlive = 42 + dialerTimeout = "42s" + responseHeaderTimeout = "42s" + tlsHandshakeTimeout = "42s" + keepAlive = "42s" forceTaskHostname = true respectReadinessChecks = true [providers.marathon.tls] @@ -108,6 +108,7 @@ ingressClass = "foobar" throttleDuration = "42s" allowEmptyServices = true + allowExternalNameServices = true [providers.kubernetesIngress.ingressEndpoint] ip = "foobar" hostname = "foobar" @@ -118,16 +119,17 @@ certAuthFilePath = "foobar" namespaces = ["foobar", "foobar"] allowCrossNamespace = true + allowExternalNameServices = true labelSelector = "foobar" ingressClass = "foobar" - throttleDuration = 42 + throttleDuration = "42s" [providers.kubernetesGateway] endpoint = "foobar" token = "foobar" certAuthFilePath = "foobar" namespaces = ["foobar", "foobar"] labelSelector = "foobar" - throttleDuration = 42 + throttleDuration = "42s" [providers.rest] insecure = true [providers.rancher] @@ -142,19 +144,22 @@ [providers.consulCatalog] constraints = "foobar" prefix = "foobar" - refreshInterval = 42 + refreshInterval = "42s" requireConsistent = true stale = true cache = true exposedByDefault = true defaultRule = "foobar" + connectAware = true + connectByDefault = true + serviceName = "foobar" namespace = "foobar" [providers.consulCatalog.endpoint] address = "foobar" scheme = "foobar" datacenter = "foobar" token = "foobar" - endpointWaitTime = 42 + endpointWaitTime = "42s" [providers.consulCatalog.endpoint.tls] ca = "foobar" caOptional = true @@ -179,8 +184,8 @@ endpoints = ["foobar", "foobar"] username = "foobar" password = "foobar" - namespace = "foobar" token = "foobar" + namespace = "foobar" [providers.consul.tls] ca = "foobar" caOptional = true @@ -192,8 +197,8 @@ endpoints = ["foobar", "foobar"] username = "foobar" password = "foobar" - namespace = "foobar" token = "foobar" + namespace = "foobar" [providers.etcd.tls] ca = "foobar" caOptional = true @@ -205,8 +210,8 @@ endpoints = ["foobar", "foobar"] username = "foobar" password = "foobar" - namespace = "foobar" token = "foobar" + namespace = "foobar" [providers.zooKeeper.tls] ca = "foobar" caOptional = true @@ -218,8 +223,8 @@ endpoints = ["foobar", "foobar"] username = "foobar" password = "foobar" - namespace = "foobar" token = "foobar" + namespace = "foobar" [providers.redis.tls] ca = "foobar" caOptional = true @@ -228,8 +233,8 @@ insecureSkipVerify = true [providers.http] endpoint = "foobar" - pollInterval = 42 - pollTimeout = 42 + pollInterval = "42s" + pollTimeout = "42s" [providers.http.tls] ca = "foobar" caOptional = true @@ -298,7 +303,7 @@ [accessLog.filters] statusCodes = ["foobar", "foobar"] retryAttempts = true - minDuration = 42 + minDuration = "42s" [accessLog.fields] defaultMode = "foobar" [accessLog.fields.names] @@ -344,6 +349,7 @@ localAgentHost = "foobar" localAgentPort = 42 logLevel = "foobar" + enableAutoProfile = true [tracing.haystack] localAgentHost = "foobar" localAgentPort = 42 @@ -367,16 +373,16 @@ [certificatesResolvers.CertificateResolver0.acme] email = "foobar" caServer = "foobar" - certificatesDuration = 2160 preferredChain = "foobar" storage = "foobar" keyType = "foobar" + certificatesDuration = 42 [certificatesResolvers.CertificateResolver0.acme.eab] kid = "foobar" hmacEncoded = "foobar" [certificatesResolvers.CertificateResolver0.acme.dnsChallenge] provider = "foobar" - delayBeforeCheck = 42 + delayBeforeCheck = "42s" resolvers = ["foobar", "foobar"] disablePropagationCheck = true [certificatesResolvers.CertificateResolver0.acme.httpChallenge] @@ -386,16 +392,16 @@ [certificatesResolvers.CertificateResolver1.acme] email = "foobar" caServer = "foobar" - certificatesDuration = 2160 preferredChain = "foobar" storage = "foobar" keyType = "foobar" + certificatesDuration = 42 [certificatesResolvers.CertificateResolver1.acme.eab] kid = "foobar" hmacEncoded = "foobar" [certificatesResolvers.CertificateResolver1.acme.dnsChallenge] provider = "foobar" - delayBeforeCheck = 42 + delayBeforeCheck = "42s" resolvers = ["foobar", "foobar"] disablePropagationCheck = true [certificatesResolvers.CertificateResolver1.acme.httpChallenge] diff --git a/docs/content/reference/static-configuration/file.yaml b/docs/content/reference/static-configuration/file.yaml index c4e5c31ee..886ae5114 100644 --- a/docs/content/reference/static-configuration/file.yaml +++ b/docs/content/reference/static-configuration/file.yaml @@ -4,38 +4,34 @@ global: serversTransport: insecureSkipVerify: true rootCAs: - - foobar - - foobar + - foobar + - foobar maxIdleConnsPerHost: 42 forwardingTimeouts: - dialTimeout: 42 - responseHeaderTimeout: 42 - idleConnTimeout: 42 + dialTimeout: 42s + responseHeaderTimeout: 42s + idleConnTimeout: 42s entryPoints: EntryPoint0: address: foobar transport: lifeCycle: - requestAcceptGraceTimeout: 42 - graceTimeOut: 42 + requestAcceptGraceTimeout: 42s + graceTimeOut: 42s respondingTimeouts: - readTimeout: 42 - writeTimeout: 42 - idleTimeout: 42 + readTimeout: 42s + writeTimeout: 42s + idleTimeout: 42s proxyProtocol: insecure: true trustedIPs: - - foobar - - foobar + - foobar + - foobar forwardedHeaders: insecure: true trustedIPs: - - foobar - - foobar - http3: - advertisedPort: 42 - udp: - timeout: 42 + - foobar + - foobar http: redirections: entryPoint: @@ -44,22 +40,26 @@ entryPoints: permanent: true priority: 42 middlewares: - - foobar - - foobar + - foobar + - foobar tls: options: foobar certResolver: foobar domains: - - main: foobar - sans: - - foobar - - foobar - - main: foobar - sans: - - foobar - - foobar + - main: foobar + sans: + - foobar + - foobar + - main: foobar + sans: + - foobar + - foobar + http3: + advertisedPort: 42 + udp: + timeout: 42s providers: - providersThrottleDuration: 42 + providersThrottleDuration: 42s docker: constraints: foobar watch: true @@ -75,8 +75,8 @@ providers: useBindPortIP: true swarmMode: true network: foobar - swarmModeRefreshSeconds: 42 - httpClientTimeout: 42 + swarmModeRefreshSeconds: 42s + httpClientTimeout: 42s file: directory: foobar watch: true @@ -96,10 +96,10 @@ providers: cert: foobar key: foobar insecureSkipVerify: true - dialerTimeout: 42 - responseHeaderTimeout: 42 - tlsHandshakeTimeout: 42 - keepAlive: 42 + dialerTimeout: 42s + responseHeaderTimeout: 42s + tlsHandshakeTimeout: 42s + keepAlive: 42s forceTaskHostname: true basic: httpBasicAuthUser: foobar @@ -110,12 +110,13 @@ providers: token: foobar certAuthFilePath: foobar namespaces: - - foobar - - foobar + - foobar + - foobar labelSelector: foobar ingressClass: foobar throttleDuration: 42s allowEmptyServices: true + allowExternalNameServices: true ingressEndpoint: ip: foobar hostname: foobar @@ -125,9 +126,10 @@ providers: token: foobar certAuthFilePath: foobar namespaces: - - foobar - - foobar + - foobar + - foobar allowCrossNamespace: true + allowExternalNameServices: true labelSelector: foobar ingressClass: foobar throttleDuration: 42s @@ -136,8 +138,8 @@ providers: token: foobar certAuthFilePath: foobar namespaces: - - foobar - - foobar + - foobar + - foobar labelSelector: foobar throttleDuration: 42s rest: @@ -160,6 +162,9 @@ providers: cache: true exposedByDefault: true defaultRule: foobar + connectAware: true + connectByDefault: true + serviceName: foobar namespace: foobar endpoint: address: foobar @@ -182,8 +187,8 @@ providers: refreshSeconds: 42 defaultRule: foobar clusters: - - foobar - - foobar + - foobar + - foobar autoDiscoverClusters: true region: foobar accessKeyID: foobar @@ -191,12 +196,12 @@ providers: consul: rootKey: foobar endpoints: - - foobar - - foobar + - foobar + - foobar username: foobar password: foobar - namespace: foobar token: foobar + namespace: foobar tls: ca: foobar caOptional: true @@ -206,12 +211,12 @@ providers: etcd: rootKey: foobar endpoints: - - foobar - - foobar + - foobar + - foobar username: foobar password: foobar - namespace: foobar token: foobar + namespace: foobar tls: ca: foobar caOptional: true @@ -221,12 +226,12 @@ providers: zooKeeper: rootKey: foobar endpoints: - - foobar - - foobar + - foobar + - foobar username: foobar password: foobar - namespace: foobar token: foobar + namespace: foobar tls: ca: foobar caOptional: true @@ -236,12 +241,12 @@ providers: redis: rootKey: foobar endpoints: - - foobar - - foobar + - foobar + - foobar username: foobar password: foobar - namespace: foobar token: foobar + namespace: foobar tls: ca: foobar caOptional: true @@ -250,8 +255,8 @@ providers: insecureSkipVerify: true http: endpoint: foobar - pollInterval: 42 - pollTimeout: 42 + pollInterval: 42s + pollTimeout: 42s tls: ca: foobar caOptional: true @@ -268,8 +273,8 @@ api: metrics: prometheus: buckets: - - 42 - - 42 + - 42 + - 42 addEntryPointsLabels: true addRoutersLabels: true addServicesLabels: true @@ -277,14 +282,14 @@ metrics: manualRouting: true datadog: address: foobar - pushInterval: 42 + pushInterval: 42s addEntryPointsLabels: true addRoutersLabels: true addServicesLabels: true prefix: foobar statsD: address: foobar - pushInterval: 42 + pushInterval: 42s addEntryPointsLabels: true addRoutersLabels: true addServicesLabels: true @@ -292,7 +297,7 @@ metrics: influxDB: address: foobar protocol: foobar - pushInterval: 42 + pushInterval: 42s database: foobar retentionPolicy: foobar username: foobar @@ -315,10 +320,10 @@ accessLog: format: foobar filters: statusCodes: - - foobar - - foobar + - foobar + - foobar retryAttempts: true - minDuration: 42 + minDuration: 42s fields: defaultMode: foobar names: @@ -364,6 +369,7 @@ tracing: localAgentHost: foobar localAgentPort: 42 logLevel: foobar + enableAutoProfile: true haystack: localAgentHost: foobar localAgentPort: 42 @@ -385,7 +391,7 @@ certificatesResolvers: acme: email: foobar caServer: foobar - certificatesDuration: 2160 + certificatesDuration: 42 preferredChain: foobar storage: foobar keyType: foobar @@ -394,10 +400,10 @@ certificatesResolvers: hmacEncoded: foobar dnsChallenge: provider: foobar - delayBeforeCheck: 42 + delayBeforeCheck: 42s resolvers: - - foobar - - foobar + - foobar + - foobar disablePropagationCheck: true httpChallenge: entryPoint: foobar @@ -406,7 +412,7 @@ certificatesResolvers: acme: email: foobar caServer: foobar - certificatesDuration: 2160 + certificatesDuration: 42 preferredChain: foobar storage: foobar keyType: foobar @@ -415,10 +421,10 @@ certificatesResolvers: hmacEncoded: foobar dnsChallenge: provider: foobar - delayBeforeCheck: 42 + delayBeforeCheck: 42s resolvers: - - foobar - - foobar + - foobar + - foobar disablePropagationCheck: true httpChallenge: entryPoint: foobar diff --git a/pkg/config/dynamic/tcp_middlewares.go b/pkg/config/dynamic/tcp_middlewares.go index 1108319f5..57d313193 100644 --- a/pkg/config/dynamic/tcp_middlewares.go +++ b/pkg/config/dynamic/tcp_middlewares.go @@ -4,7 +4,7 @@ package dynamic // TCPMiddleware holds the TCPMiddleware configuration. type TCPMiddleware struct { - InFlightConn *TCPInFlightConn `json:"InFlightConn,omitempty" toml:"InFlightConn,omitempty" yaml:"InFlightConn,omitempty" export:"true"` + InFlightConn *TCPInFlightConn `json:"inFlightConn,omitempty" toml:"inFlightConn,omitempty" yaml:"inFlightConn,omitempty" export:"true"` IPWhiteList *TCPIPWhiteList `json:"ipWhiteList,omitempty" toml:"ipWhiteList,omitempty" yaml:"ipWhiteList,omitempty" export:"true"` }