Merge branch v2.6 into v2.7

2022-04-21 10:59:46 +02:00 · 2022-04-21 10:59:46 +02:00 · 73ba7ed2d2
commit 73ba7ed2d2
parent a49b537d9c 55addfefc8
145 changed files with 1187 additions and 502 deletions
--- a/docs/content/reference/static-configuration/cli.md
+++ b/docs/content/reference/static-configuration/cli.md
@ -1,3 +1,8 @@
+---
+title: "Traefik CLI Flags Documentation"
+description: "Reference the CLI flags for static configuration in Traefik Proxy. Read the technical documentation."
+---
+
 # Static Configuration: CLI

 --8<-- "content/reference/static-configuration/cli-ref.md"
--- a/docs/content/reference/static-configuration/env.md
+++ b/docs/content/reference/static-configuration/env.md
@ -1,3 +1,8 @@
+---
+title: "Traefik Environment Variables Documentation"
+description: "Reference the environment variables for static configuration in Traefik Proxy. Read the technical documentation."
+---
+
 # Static Configuration: Environment variables

 --8<-- "content/reference/static-configuration/env-ref.md"
--- a/docs/content/reference/static-configuration/file.md
+++ b/docs/content/reference/static-configuration/file.md
@ -1,3 +1,8 @@
+---
+title: "Traefik File Static Configuration"
+description: "Reference the YAML and TOML files for static configuration in Traefik Proxy. Read the technical documentation."
+---
+
 # Static Configuration: File

 ```yml  tab="YAML"
--- 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,17 +119,18 @@
    certAuthFilePath = "foobar"
    namespaces = ["foobar", "foobar"]
    allowCrossNamespace = true
+    allowExternalNameServices = true
    labelSelector = "foobar"
    ingressClass = "foobar"
-    throttleDuration = 42
    allowEmptyServices = true
+    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]
@ -143,12 +145,15 @@
  [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"
    watch = true
    [providers.consulCatalog.endpoint]
@ -156,7 +161,7 @@
      scheme = "foobar"
      datacenter = "foobar"
      token = "foobar"
-      endpointWaitTime = 42
+      endpointWaitTime = "42s"
      [providers.consulCatalog.endpoint.tls]
        ca = "foobar"
        caOptional = true
@ -181,8 +186,8 @@
    endpoints = ["foobar", "foobar"]
    username = "foobar"
    password = "foobar"
-    namespace = "foobar"
    token = "foobar"
+    namespace = "foobar"
    [providers.consul.tls]
      ca = "foobar"
      caOptional = true
@ -194,8 +199,8 @@
    endpoints = ["foobar", "foobar"]
    username = "foobar"
    password = "foobar"
-    namespace = "foobar"
    token = "foobar"
+    namespace = "foobar"
    [providers.etcd.tls]
      ca = "foobar"
      caOptional = true
@ -207,8 +212,8 @@
    endpoints = ["foobar", "foobar"]
    username = "foobar"
    password = "foobar"
-    namespace = "foobar"
    token = "foobar"
+    namespace = "foobar"
    [providers.zooKeeper.tls]
      ca = "foobar"
      caOptional = true
@ -220,8 +225,8 @@
    endpoints = ["foobar", "foobar"]
    username = "foobar"
    password = "foobar"
-    namespace = "foobar"
    token = "foobar"
+    namespace = "foobar"
    [providers.redis.tls]
      ca = "foobar"
      caOptional = true
@ -230,8 +235,8 @@
      insecureSkipVerify = true
  [providers.http]
    endpoint = "foobar"
-    pollInterval = 42
-    pollTimeout = 42
+    pollInterval = "42s"
+    pollTimeout = "42s"
    [providers.http.tls]
      ca = "foobar"
      caOptional = true
@ -311,7 +316,7 @@
  [accessLog.filters]
    statusCodes = ["foobar", "foobar"]
    retryAttempts = true
-    minDuration = 42
+    minDuration = "42s"
  [accessLog.fields]
    defaultMode = "foobar"
    [accessLog.fields.names]
@ -357,6 +362,7 @@
    localAgentHost = "foobar"
    localAgentPort = 42
    logLevel = "foobar"
+    enableAutoProfile = true
  [tracing.haystack]
    localAgentHost = "foobar"
    localAgentPort = 42
@ -380,16 +386,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]
@ -399,16 +405,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]
--- 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
@ -137,8 +139,8 @@ providers:
    token: foobar
    certAuthFilePath: foobar
    namespaces:
-    - foobar
-    - foobar
+      - foobar
+      - foobar
    labelSelector: foobar
    throttleDuration: 42s
  rest:
@ -161,6 +163,9 @@ providers:
    cache: true
    exposedByDefault: true
    defaultRule: foobar
+    connectAware: true
+    connectByDefault: true
+    serviceName: foobar
    namespace: foobar
    watch: true
    endpoint:
@ -184,8 +189,8 @@ providers:
    refreshSeconds: 42
    defaultRule: foobar
    clusters:
-    - foobar
-    - foobar
+      - foobar
+      - foobar
    autoDiscoverClusters: true
    region: foobar
    accessKeyID: foobar
@ -193,12 +198,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
@ -208,12 +213,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
@ -223,12 +228,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
@ -238,12 +243,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
@ -252,8 +257,8 @@ providers:
      insecureSkipVerify: true
  http:
    endpoint: foobar
-    pollInterval: 42
-    pollTimeout: 42
+    pollInterval: 42s
+    pollTimeout: 42s
    tls:
      ca: foobar
      caOptional: true
@ -270,8 +275,8 @@ api:
 metrics:
  prometheus:
    buckets:
-    - 42
-    - 42
+      - 42
+      - 42
    addEntryPointsLabels: true
    addRoutersLabels: true
    addServicesLabels: true
@ -279,14 +284,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
@ -294,7 +299,7 @@ metrics:
  influxDB:
    address: foobar
    protocol: foobar
-    pushInterval: 42
+    pushInterval: 42s
    database: foobar
    retentionPolicy: foobar
    username: foobar
@ -329,10 +334,10 @@ accessLog:
  format: foobar
  filters:
    statusCodes:
-    - foobar
-    - foobar
+      - foobar
+      - foobar
    retryAttempts: true
-    minDuration: 42
+    minDuration: 42s
  fields:
    defaultMode: foobar
    names:
@ -378,6 +383,7 @@ tracing:
    localAgentHost: foobar
    localAgentPort: 42
    logLevel: foobar
+    enableAutoProfile: true
  haystack:
    localAgentHost: foobar
    localAgentPort: 42
@ -399,7 +405,7 @@ certificatesResolvers:
    acme:
      email: foobar
      caServer: foobar
-      certificatesDuration: 2160
+      certificatesDuration: 42
      preferredChain: foobar
      storage: foobar
      keyType: foobar
@ -408,10 +414,10 @@ certificatesResolvers:
        hmacEncoded: foobar
      dnsChallenge:
        provider: foobar
-        delayBeforeCheck: 42
+        delayBeforeCheck: 42s
        resolvers:
-        - foobar
-        - foobar
+          - foobar
+          - foobar
        disablePropagationCheck: true
      httpChallenge:
        entryPoint: foobar
@ -420,7 +426,7 @@ certificatesResolvers:
    acme:
      email: foobar
      caServer: foobar
-      certificatesDuration: 2160
+      certificatesDuration: 42
      preferredChain: foobar
      storage: foobar
      keyType: foobar
@ -429,10 +435,10 @@ certificatesResolvers:
        hmacEncoded: foobar
      dnsChallenge:
        provider: foobar
-        delayBeforeCheck: 42
+        delayBeforeCheck: 42s
        resolvers:
-        - foobar
-        - foobar
+          - foobar
+          - foobar
        disablePropagationCheck: true
      httpChallenge:
        entryPoint: foobar
--- a/docs/content/reference/static-configuration/overview.md
+++ b/docs/content/reference/static-configuration/overview.md
@ -1,3 +1,8 @@
+---
+title: "Traefik Static Configuration Overview"
+description: "Read the official Traefik documentation to get started with static configuration in Traefik Proxy."
+---
+
 # Static Configuration

 - [File](./file.md)