From 5f9a84fc8b1e9abcbe04f7975d14628404b76956 Mon Sep 17 00:00:00 2001
From: Tim Obezuk <501943+obezuk@users.noreply.github.com>
Date: Tue, 26 Jan 2021 00:20:04 -0800
Subject: [PATCH 01/14] Fix typo in server transports documentation

---
 docs/content/routing/services/index.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md
index 921009894..9c59e4a1d 100644
--- a/docs/content/routing/services/index.md
+++ b/docs/content/routing/services/index.md
@@ -573,7 +573,7 @@ that will be set as client certificates for mTLS.
 http:
   serversTransports:
     mytransport:
-      certficates:
+      certificates:
         - certFile: foo.crt
           keyFile: bar.crt
 ```

From a371f971fb63bc1198faf007247241c1a40c3e89 Mon Sep 17 00:00:00 2001
From: Ludovic Fernandez <ldez@users.noreply.github.com>
Date: Thu, 28 Jan 2021 09:00:03 +0100
Subject: [PATCH 02/14] chore: update linter.

---
 .golangci.toml                                     | 3 ++-
 build.Dockerfile                                   | 2 +-
 pkg/metrics/prometheus.go                          | 4 ++--
 pkg/middlewares/compress/compress_test.go          | 4 ++--
 pkg/middlewares/customerrors/custom_errors_test.go | 7 +++++++
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.golangci.toml b/.golangci.toml
index c028010c2..5486bc1ee 100644
--- a/.golangci.toml
+++ b/.golangci.toml
@@ -61,6 +61,7 @@
     "exhaustivestruct", # Not relevant
     "makezero", # not relevant
     "forbidigo", # not relevant
+    "ifshort", # not relevant
   ]
 
 [issues]
@@ -119,4 +120,4 @@
     text = "printf-like formatting function 'SetErrorWithEvent' should be named 'SetErrorWithEventf'"
  [[issues.exclude-rules]]
     path = "pkg/log/deprecated.go"
-    linters = ["godot"]
\ No newline at end of file
+    linters = ["godot"]
diff --git a/build.Dockerfile b/build.Dockerfile
index 29b4c1b24..2ed4a1217 100644
--- a/build.Dockerfile
+++ b/build.Dockerfile
@@ -19,7 +19,7 @@ RUN mkdir -p /usr/local/bin \
     && chmod +x /usr/local/bin/go-bindata
 
 # Download golangci-lint binary to bin folder in $GOPATH
-RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.34.0
+RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | bash -s -- -b $GOPATH/bin v1.36.0
 
 # Download misspell binary to bin folder in $GOPATH
 RUN  curl -sfL https://raw.githubusercontent.com/client9/misspell/master/install-misspell.sh | bash -s -- -b $GOPATH/bin v0.3.4
diff --git a/pkg/metrics/prometheus.go b/pkg/metrics/prometheus.go
index b627b50b4..f936a0728 100644
--- a/pkg/metrics/prometheus.go
+++ b/pkg/metrics/prometheus.go
@@ -379,12 +379,12 @@ func (d *dynamicConfig) hasServerURL(serviceName, serverURL string) bool {
 	return false
 }
 
-func newCollector(metricName string, labels stdprometheus.Labels, c stdprometheus.Collector, delete func()) *collector {
+func newCollector(metricName string, labels stdprometheus.Labels, c stdprometheus.Collector, deleteFn func()) *collector {
 	return &collector{
 		id:        buildMetricID(metricName, labels),
 		labels:    labels,
 		collector: c,
-		delete:    delete,
+		delete:    deleteFn,
 	}
 }
 
diff --git a/pkg/middlewares/compress/compress_test.go b/pkg/middlewares/compress/compress_test.go
index acee7346d..2c7fb97f4 100644
--- a/pkg/middlewares/compress/compress_test.go
+++ b/pkg/middlewares/compress/compress_test.go
@@ -284,9 +284,9 @@ func TestIntegrationShouldCompress(t *testing.T) {
 	}
 }
 
-func generateBytes(len int) []byte {
+func generateBytes(length int) []byte {
 	var value []byte
-	for i := 0; i < len; i++ {
+	for i := 0; i < length; i++ {
 		value = append(value, 0x61+byte(i))
 	}
 	return value
diff --git a/pkg/middlewares/customerrors/custom_errors_test.go b/pkg/middlewares/customerrors/custom_errors_test.go
index fca283bfa..025851871 100644
--- a/pkg/middlewares/customerrors/custom_errors_test.go
+++ b/pkg/middlewares/customerrors/custom_errors_test.go
@@ -29,6 +29,7 @@ func TestHandler(t *testing.T) {
 				fmt.Fprintln(w, "My error page.")
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusOK, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusOK))
 			},
@@ -41,6 +42,7 @@ func TestHandler(t *testing.T) {
 				fmt.Fprintln(w, "My error page.")
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusPartialContent, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusPartialContent))
 			},
@@ -53,6 +55,7 @@ func TestHandler(t *testing.T) {
 				fmt.Fprintln(w, "whatever, should not be called")
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusNotModified, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), "")
 			},
@@ -65,6 +68,7 @@ func TestHandler(t *testing.T) {
 				fmt.Fprintln(w, "My error page.")
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusInternalServerError, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), "My error page.")
 				assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")
@@ -78,6 +82,7 @@ func TestHandler(t *testing.T) {
 				fmt.Fprintln(w, "My error page.")
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusBadGateway, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), http.StatusText(http.StatusBadGateway))
 				assert.NotContains(t, recorder.Body.String(), "Test Server", "Should return the oops page since we have not configured the 502 code")
@@ -95,6 +100,7 @@ func TestHandler(t *testing.T) {
 				}
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), "My 503 page.")
 				assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")
@@ -112,6 +118,7 @@ func TestHandler(t *testing.T) {
 				}
 			}),
 			validate: func(t *testing.T, recorder *httptest.ResponseRecorder) {
+				t.Helper()
 				assert.Equal(t, http.StatusServiceUnavailable, recorder.Code, "HTTP status")
 				assert.Contains(t, recorder.Body.String(), "My 503 page.")
 				assert.NotContains(t, recorder.Body.String(), "oops", "Should not return the oops page")

From 49ec62c757ddf4c9b314909dd1a7d2d795bd95cd Mon Sep 17 00:00:00 2001
From: Gabe Levasseur <11285350+GabeL7r@users.noreply.github.com>
Date: Thu, 28 Jan 2021 02:10:04 -0800
Subject: [PATCH 03/14] Fix refresh interval option description in
 consulcatalog provider

---
 docs/content/reference/static-configuration/cli-ref.md | 2 +-
 docs/content/reference/static-configuration/env-ref.md | 2 +-
 pkg/provider/consulcatalog/consul_catalog.go           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/content/reference/static-configuration/cli-ref.md b/docs/content/reference/static-configuration/cli-ref.md
index c01e9cbb4..fd448bd50 100644
--- a/docs/content/reference/static-configuration/cli-ref.md
+++ b/docs/content/reference/static-configuration/cli-ref.md
@@ -394,7 +394,7 @@ Expose containers by default. (Default: ```true```)
 Prefix for consul service tags. Default 'traefik' (Default: ```traefik```)
 
 `--providers.consulcatalog.refreshinterval`:  
-Interval for check Consul API. Default 100ms (Default: ```15```)
+Interval for check Consul API. Default 15s (Default: ```15```)
 
 `--providers.consulcatalog.requireconsistent`:  
 Forces the read to be fully consistent. (Default: ```false```)
diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md
index a0fa23028..786a123ba 100644
--- a/docs/content/reference/static-configuration/env-ref.md
+++ b/docs/content/reference/static-configuration/env-ref.md
@@ -367,7 +367,7 @@ Expose containers by default. (Default: ```true```)
 Prefix for consul service tags. Default 'traefik' (Default: ```traefik```)
 
 `TRAEFIK_PROVIDERS_CONSULCATALOG_REFRESHINTERVAL`:  
-Interval for check Consul API. Default 100ms (Default: ```15```)
+Interval for check Consul API. Default 15s (Default: ```15```)
 
 `TRAEFIK_PROVIDERS_CONSULCATALOG_REQUIRECONSISTENT`:  
 Forces the read to be fully consistent. (Default: ```false```)
diff --git a/pkg/provider/consulcatalog/consul_catalog.go b/pkg/provider/consulcatalog/consul_catalog.go
index 3f2345ec7..c6937f10a 100644
--- a/pkg/provider/consulcatalog/consul_catalog.go
+++ b/pkg/provider/consulcatalog/consul_catalog.go
@@ -42,7 +42,7 @@ type Provider struct {
 	Constraints       string          `description:"Constraints is an expression that Traefik matches against the container's labels to determine whether to create any route for that container." json:"constraints,omitempty" toml:"constraints,omitempty" yaml:"constraints,omitempty" export:"true"`
 	Endpoint          *EndpointConfig `description:"Consul endpoint settings" json:"endpoint,omitempty" toml:"endpoint,omitempty" yaml:"endpoint,omitempty" export:"true"`
 	Prefix            string          `description:"Prefix for consul service tags. Default 'traefik'" json:"prefix,omitempty" toml:"prefix,omitempty" yaml:"prefix,omitempty" export:"true"`
-	RefreshInterval   ptypes.Duration `description:"Interval for check Consul API. Default 100ms" json:"refreshInterval,omitempty" toml:"refreshInterval,omitempty" yaml:"refreshInterval,omitempty" export:"true"`
+	RefreshInterval   ptypes.Duration `description:"Interval for check Consul API. Default 15s" json:"refreshInterval,omitempty" toml:"refreshInterval,omitempty" yaml:"refreshInterval,omitempty" export:"true"`
 	RequireConsistent bool            `description:"Forces the read to be fully consistent." json:"requireConsistent,omitempty" toml:"requireConsistent,omitempty" yaml:"requireConsistent,omitempty" export:"true"`
 	Stale             bool            `description:"Use stale consistency for catalog reads." json:"stale,omitempty" toml:"stale,omitempty" yaml:"stale,omitempty" export:"true"`
 	Cache             bool            `description:"Use local agent caching for catalog reads." json:"cache,omitempty" toml:"cache,omitempty" yaml:"cache,omitempty" export:"true"`

From 9a931e4dc9d8043fad190505c21d4f4768842855 Mon Sep 17 00:00:00 2001
From: LandryBe <lbenguigui@gmail.com>
Date: Thu, 28 Jan 2021 15:08:04 +0100
Subject: [PATCH 04/14] fix: add support for multiple ingress classes

---
 pkg/provider/kubernetes/ingress/client.go     | 11 ++++---
 .../kubernetes/ingress/client_mock_test.go    | 16 +++++-----
 ...mespace-with-same-service-name_service.yml |  4 +--
 .../Double-Single-Service-Ingress_service.yml |  4 +--
 ...les-with-one-host-and-one-path_service.yml |  2 +-
 ...le-with-one-host-and-two-paths_service.yml |  2 +-
 ...ule-with-one-path-and-one-host_service.yml |  2 +-
 ...ngress-one-rule-with-two-paths_service.yml |  2 +-
 .../Ingress-with-IPv6-endpoints_service.yml   |  2 +-
 ...Ingress-with-a-bad-host-syntax_service.yml |  2 +-
 ...Ingress-with-a-bad-path-syntax_service.yml |  2 +-
 ...-path-with-https-(port-==-443)_service.yml |  2 +-
 ...with-https-(portname-==-https)_service.yml |  2 +-
 ...s-(portname-starts-with-https)_service.yml |  2 +-
 ...-with-a-basic-rule-on-one-path_service.yml |  2 +-
 .../Ingress-with-annotations_service.yml      |  2 +-
 ...th-conflicting-routers-on-host_service.yml |  2 +-
 ...th-conflicting-routers-on-path_service.yml |  2 +-
 ...h-default-traefik-ingressClass_service.yml |  2 +-
 ...ngressClass-without-annotation_service.yml |  2 +-
 ...ik-ingressClass-and-annotation_service.yml |  2 +-
 ...ess-with-one-host-without-path_service.yml |  2 +-
 ...h-one-service-without-endpoint_service.yml |  2 +-
 ...rvice-without-endpoints-subset_service.yml |  2 +-
 ...ss-with-only-a-bad-host-syntax_service.yml |  2 +-
 ...ss-with-only-a-bad-path-syntax_service.yml |  2 +-
 ...-in-backend-and-no-pod-replica_service.yml |  2 +-
 ...-in-backend-and-no-pod-replica_service.yml |  2 +-
 ...with-service-with-externalName_service.yml |  2 +-
 ...-different-rules-with-one-path_service.yml |  2 +-
 ...ervice-and-different-port-name_service.yml |  2 +-
 .../Ingress-with-two-services_service.yml     |  4 +--
 ...with-unknown-service-port-name_service.yml |  2 +-
 ...ress-with-unknown-service-port_service.yml |  2 +-
 .../Ingress-with-wildcard-host_service.yml    |  2 +-
 ...e-in-backend-and-2-pod-replica_service.yml |  2 +-
 ...ssClass-and-unknown-annotation_service.yml |  2 +-
 ...ce-Ingress-(without-any-rules)_service.yml |  2 +-
 .../ingress/fixtures/TLS-support_service.yml  |  4 +--
 ...18-Ingress-with-empty-pathType_service.yml |  2 +-
 ...18-Ingress-with-exact-pathType_service.yml |  2 +-
 ...mplementationSpecific-pathType_service.yml |  2 +-
 ...ngress-with-ingress-annotation_service.yml |  2 +-
 .../v18-Ingress-with-ingressClass_service.yml |  2 +-
 ...ress-with-missing-ingressClass_service.yml |  2 +-
 ...-with-multiple-ingressClasses_endpoint.yml | 11 +++++++
 ...s-with-multiple-ingressClasses_ingress.yml | 30 +++++++++++++++++
 ...h-multiple-ingressClasses_ingressclass.yml | 14 ++++++++
 ...s-with-multiple-ingressClasses_service.yml | 10 ++++++
 .../v18-Ingress-with-no-pathType_service.yml  |  2 +-
 ...8-Ingress-with-prefix-pathType_service.yml |  2 +-
 pkg/provider/kubernetes/ingress/kubernetes.go | 24 ++++++++------
 .../kubernetes/ingress/kubernetes_test.go     | 32 +++++++++++++++++++
 53 files changed, 175 insertions(+), 71 deletions(-)
 create mode 100644 pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_endpoint.yml
 create mode 100644 pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingress.yml
 create mode 100644 pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingressclass.yml
 create mode 100644 pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_service.yml

diff --git a/pkg/provider/kubernetes/ingress/client.go b/pkg/provider/kubernetes/ingress/client.go
index 7f3c67534..f05a85372 100644
--- a/pkg/provider/kubernetes/ingress/client.go
+++ b/pkg/provider/kubernetes/ingress/client.go
@@ -56,7 +56,7 @@ func (reh *resourceEventHandler) OnDelete(obj interface{}) {
 type Client interface {
 	WatchAll(namespaces []string, stopCh <-chan struct{}) (<-chan interface{}, error)
 	GetIngresses() []*networkingv1beta1.Ingress
-	GetIngressClass() (*networkingv1beta1.IngressClass, error)
+	GetIngressClasses() ([]*networkingv1beta1.IngressClass, error)
 	GetService(namespace, name string) (*corev1.Service, bool, error)
 	GetSecret(namespace, name string) (*corev1.Secret, bool, error)
 	GetEndpoints(namespace, name string) (*corev1.Endpoints, bool, error)
@@ -393,9 +393,9 @@ func (c *clientWrapper) GetSecret(namespace, name string) (*corev1.Secret, bool,
 	return secret, exist, err
 }
 
-func (c *clientWrapper) GetIngressClass() (*networkingv1beta1.IngressClass, error) {
+func (c *clientWrapper) GetIngressClasses() ([]*networkingv1beta1.IngressClass, error) {
 	if c.clusterFactory == nil {
-		return nil, errors.New("failed to find ingressClass: factory not loaded")
+		return nil, errors.New("cluster factory not loaded")
 	}
 
 	ingressClasses, err := c.clusterFactory.Networking().V1beta1().IngressClasses().Lister().List(labels.Everything())
@@ -403,13 +403,14 @@ func (c *clientWrapper) GetIngressClass() (*networkingv1beta1.IngressClass, erro
 		return nil, err
 	}
 
+	var ics []*networkingv1beta1.IngressClass
 	for _, ic := range ingressClasses {
 		if ic.Spec.Controller == traefikDefaultIngressClassController {
-			return ic, nil
+			ics = append(ics, ic)
 		}
 	}
 
-	return nil, nil
+	return ics, nil
 }
 
 // lookupNamespace returns the lookup namespace key for the given namespace.
diff --git a/pkg/provider/kubernetes/ingress/client_mock_test.go b/pkg/provider/kubernetes/ingress/client_mock_test.go
index 60d0851b0..9ea62d393 100644
--- a/pkg/provider/kubernetes/ingress/client_mock_test.go
+++ b/pkg/provider/kubernetes/ingress/client_mock_test.go
@@ -14,11 +14,11 @@ import (
 var _ Client = (*clientMock)(nil)
 
 type clientMock struct {
-	ingresses    []*networkingv1beta1.Ingress
-	services     []*corev1.Service
-	secrets      []*corev1.Secret
-	endpoints    []*corev1.Endpoints
-	ingressClass *networkingv1beta1.IngressClass
+	ingresses      []*networkingv1beta1.Ingress
+	services       []*corev1.Service
+	secrets        []*corev1.Secret
+	endpoints      []*corev1.Endpoints
+	ingressClasses []*networkingv1beta1.IngressClass
 
 	serverVersion *version.Version
 
@@ -59,7 +59,7 @@ func newClientMock(serverVersion string, paths ...string) clientMock {
 				}
 				c.ingresses = append(c.ingresses, ing)
 			case *networkingv1beta1.IngressClass:
-				c.ingressClass = o
+				c.ingressClasses = append(c.ingressClasses, o)
 			default:
 				panic(fmt.Sprintf("Unknown runtime object %+v %T", o, o))
 			}
@@ -117,8 +117,8 @@ func (c clientMock) GetSecret(namespace, name string) (*corev1.Secret, bool, err
 	return nil, false, nil
 }
 
-func (c clientMock) GetIngressClass() (*networkingv1beta1.IngressClass, error) {
-	return c.ingressClass, nil
+func (c clientMock) GetIngressClasses() ([]*networkingv1beta1.IngressClass, error) {
+	return c.ingressClasses, nil
 }
 
 func (c clientMock) WatchAll(namespaces []string, stopCh <-chan struct{}) (<-chan interface{}, error) {
diff --git a/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml
index cb7e60577..0ca4be86a 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/2-ingresses-in-different-namespace-with-same-service-name_service.yml
@@ -8,7 +8,7 @@ spec:
   ports:
     - name: tchouk
       port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
 ---
 kind: Service
@@ -21,4 +21,4 @@ spec:
   ports:
     - name: tchouk
       port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml
index 3d6e0a368..aa1c61f36 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Double-Single-Service-Ingress_service.yml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
 ---
 kind: Service
@@ -19,4 +19,4 @@ metadata:
 spec:
   ports:
     - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-Two-rules-with-one-host-and-one-path_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-host-and-two-paths_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-one-path-and-one-host_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-one-rule-with-two-paths_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-IPv6-endpoints_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-IPv6-endpoints_service.yml
index 9b8bfdb8b..da1189725 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-IPv6-endpoints_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-IPv6-endpoints_service.yml
@@ -8,7 +8,7 @@ spec:
   ports:
   - name: http
     port: 8080
-  clusterIp: "fc00:f853:ccd:e793::1"
+  clusterIP: "fc00:f853:ccd:e793::1"
   type: ClusterIP
 
 ---
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-host-syntax_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-bad-path-syntax_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml
index f26256b02..8c4b63324 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(port-==-443)_service.yml
@@ -8,4 +8,4 @@ spec:
   ports:
   - port: 443
     targetPort: 8443
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml
index cf169b491..106e85b97 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-==-https)_service.yml
@@ -9,4 +9,4 @@ spec:
   - name: https
     protocol: ""
     port: 8443
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml
index b0d0247c6..0a858f63b 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path-with-https-(portname-starts-with-https)_service.yml
@@ -9,4 +9,4 @@ spec:
   - name: https-foo
     protocol: ""
     port: 8443
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml
index af223a1af..cc747fa4d 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-a-basic-rule-on-one-path_service.yml
@@ -8,4 +8,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-annotations_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-annotations_service.yml
index c3eaf80d3..980d463c2 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-annotations_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-annotations_service.yml
@@ -17,4 +17,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-host_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-host_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-host_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-host_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-path_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-path_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-conflicting-routers-on-path_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-default-traefik-ingressClass_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-ingressClass-without-annotation_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-non-matching-provider-traefik-ingressClass-and-annotation_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml
index 79d6438c6..d68c69269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-host-without-path_service.yml
@@ -8,5 +8,5 @@ spec:
   ports:
   - name: http
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
   type: ClusterIP
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoint_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-one-service-without-endpoints-subset_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-host-syntax_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml
index 62f82401a..e05f39335 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-only-a-bad-path-syntax_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
     - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml
index 9b01f8cbf..141a467c1 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-name-in-backend-and-no-pod-replica_service.yml
@@ -10,5 +10,5 @@ spec:
     port: 8082
   - name: tchouk
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml
index 9b01f8cbf..141a467c1 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-port-value-in-backend-and-no-pod-replica_service.yml
@@ -10,5 +10,5 @@ spec:
     port: 8082
   - name: tchouk
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml
index b97a8b85f..972e4cdbc 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-service-with-externalName_service.yml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
   - port: 8080
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
   type: ExternalName
   externalName: traefik.wtf
 
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-different-rules-with-one-path_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml
index 9b01f8cbf..141a467c1 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-paths-using-same-service-and-different-port-name_service.yml
@@ -10,5 +10,5 @@ spec:
     port: 8082
   - name: tchouk
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml
index 904eab3b5..befb87b74 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-two-services_service.yml
@@ -7,7 +7,7 @@ metadata:
 spec:
   ports:
     - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
 ---
 kind: Service
@@ -19,4 +19,4 @@ metadata:
 spec:
   ports:
     - port: 8082
-  clusterIp: 10.1.0.1
+  clusterIP: 10.1.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port-name_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-unknown-service-port_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-wildcard-host_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-wildcard-host_service.yml
index af223a1af..cc747fa4d 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-wildcard-host_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-wildcard-host_service.yml
@@ -8,4 +8,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml
index 9b01f8cbf..141a467c1 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-with-with-port-name-in-backend-and-2-pod-replica_service.yml
@@ -10,5 +10,5 @@ spec:
     port: 8082
   - name: tchouk
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
 
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Ingress-without-provider-traefik-ingressClass-and-unknown-annotation_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml b/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/Single-Service-Ingress-(without-any-rules)_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml
index eeb5d5195..d204e8dbb 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/TLS-support_service.yml
@@ -8,7 +8,7 @@ spec:
   ports:
   - name: http
     port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
   type: ClusterIP
 
 ---
@@ -22,5 +22,5 @@ spec:
   ports:
   - name: http
     port: 80
-  clusterIp: 10.0.0.2
+  clusterIP: 10.0.0.2
   type: ClusterIP
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-empty-pathType_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-empty-pathType_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-empty-pathType_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-empty-pathType_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-exact-pathType_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-exact-pathType_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-exact-pathType_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-exact-pathType_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-implementationSpecific-pathType_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-implementationSpecific-pathType_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-implementationSpecific-pathType_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-implementationSpecific-pathType_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingress-annotation_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingress-annotation_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingress-annotation_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingress-annotation_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingressClass_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingressClass_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingressClass_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-ingressClass_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-missing-ingressClass_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-missing-ingressClass_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-missing-ingressClass_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-missing-ingressClass_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_endpoint.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_endpoint.yml
new file mode 100644
index 000000000..6ed60d79c
--- /dev/null
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_endpoint.yml
@@ -0,0 +1,11 @@
+kind: Endpoints
+apiVersion: v1
+metadata:
+  name: service1
+  namespace: testing
+
+subsets:
+- addresses:
+  - ip: 10.10.0.1
+  ports:
+  - port: 8080
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingress.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingress.yml
new file mode 100644
index 000000000..fb4eec709
--- /dev/null
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingress.yml
@@ -0,0 +1,30 @@
+kind: Ingress
+apiVersion: networking.k8s.io/v1beta1
+metadata:
+  name: ""
+  namespace: testing
+spec:
+  ingressClassName: traefik-lb
+  rules:
+  - http:
+      paths:
+      - path: /bar
+        backend:
+          serviceName: service1
+          servicePort: 80
+
+---
+kind: Ingress
+apiVersion: networking.k8s.io/v1beta1
+metadata:
+  name: ""
+  namespace: testing
+spec:
+  ingressClassName: traefik-lb2
+  rules:
+    - http:
+        paths:
+          - path: /foo
+            backend:
+              serviceName: service1
+              servicePort: 80
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingressclass.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingressclass.yml
new file mode 100644
index 000000000..c0dd6d23a
--- /dev/null
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_ingressclass.yml
@@ -0,0 +1,14 @@
+apiVersion: networking.k8s.io/v1beta1
+kind: IngressClass
+metadata:
+  name: traefik-lb2
+spec:
+  controller: traefik.io/ingress-controller
+
+---
+apiVersion: networking.k8s.io/v1beta1
+kind: IngressClass
+metadata:
+  name: traefik-lb
+spec:
+  controller: traefik.io/ingress-controller
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_service.yml
new file mode 100644
index 000000000..0ec7e2269
--- /dev/null
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-multiple-ingressClasses_service.yml
@@ -0,0 +1,10 @@
+kind: Service
+apiVersion: v1
+metadata:
+  name: service1
+  namespace: testing
+
+spec:
+  ports:
+  - port: 80
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-no-pathType_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-no-pathType_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-no-pathType_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-no-pathType_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-prefix-pathType_service.yml b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-prefix-pathType_service.yml
index 7c58aeed5..0ec7e2269 100644
--- a/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-prefix-pathType_service.yml
+++ b/pkg/provider/kubernetes/ingress/fixtures/v18-Ingress-with-prefix-pathType_service.yml
@@ -7,4 +7,4 @@ metadata:
 spec:
   ports:
   - port: 80
-  clusterIp: 10.0.0.1
+  clusterIP: 10.0.0.1
diff --git a/pkg/provider/kubernetes/ingress/kubernetes.go b/pkg/provider/kubernetes/ingress/kubernetes.go
index 28c0e2a16..4c6e82e6d 100644
--- a/pkg/provider/kubernetes/ingress/kubernetes.go
+++ b/pkg/provider/kubernetes/ingress/kubernetes.go
@@ -190,15 +190,15 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
 		return conf
 	}
 
-	var ingressClass *networkingv1beta1.IngressClass
+	var ingressClasses []*networkingv1beta1.IngressClass
 
 	if supportsIngressClass(serverVersion) {
-		ic, err := client.GetIngressClass()
+		ics, err := client.GetIngressClasses()
 		if err != nil {
-			log.FromContext(ctx).Warnf("Failed to find an ingress class: %v", err)
+			log.FromContext(ctx).Warnf("Failed to list ingress classes: %v", err)
 		}
 
-		ingressClass = ic
+		ingressClasses = ics
 	}
 
 	ingresses := client.GetIngresses()
@@ -207,7 +207,7 @@ func (p *Provider) loadConfigurationFromIngresses(ctx context.Context, client Cl
 	for _, ingress := range ingresses {
 		ctx = log.With(ctx, log.Str("ingress", ingress.Name), log.Str("namespace", ingress.Namespace))
 
-		if !p.shouldProcessIngress(p.IngressClass, ingress, ingressClass) {
+		if !p.shouldProcessIngress(ingress, ingressClasses) {
 			continue
 		}
 
@@ -351,14 +351,20 @@ func (p *Provider) updateIngressStatus(ing *networkingv1beta1.Ingress, k8sClient
 	return k8sClient.UpdateIngressStatus(ing, service.Status.LoadBalancer.Ingress)
 }
 
-func (p *Provider) shouldProcessIngress(providerIngressClass string, ingress *networkingv1beta1.Ingress, ingressClass *networkingv1beta1.IngressClass) bool {
+func (p *Provider) shouldProcessIngress(ingress *networkingv1beta1.Ingress, ingressClasses []*networkingv1beta1.IngressClass) bool {
 	// configuration through the new kubernetes ingressClass
 	if ingress.Spec.IngressClassName != nil {
-		return ingressClass != nil && ingressClass.ObjectMeta.Name == *ingress.Spec.IngressClassName
+		for _, ic := range ingressClasses {
+			if *ingress.Spec.IngressClassName == ic.ObjectMeta.Name {
+				return true
+			}
+		}
+
+		return false
 	}
 
-	return providerIngressClass == ingress.Annotations[annotationKubernetesIngressClass] ||
-		len(providerIngressClass) == 0 && ingress.Annotations[annotationKubernetesIngressClass] == traefikDefaultIngressClass
+	return p.IngressClass == ingress.Annotations[annotationKubernetesIngressClass] ||
+		len(p.IngressClass) == 0 && ingress.Annotations[annotationKubernetesIngressClass] == traefikDefaultIngressClass
 }
 
 func buildHostRule(host string) string {
diff --git a/pkg/provider/kubernetes/ingress/kubernetes_test.go b/pkg/provider/kubernetes/ingress/kubernetes_test.go
index 90c7b45c3..16b7b3a61 100644
--- a/pkg/provider/kubernetes/ingress/kubernetes_test.go
+++ b/pkg/provider/kubernetes/ingress/kubernetes_test.go
@@ -1061,6 +1061,38 @@ func TestLoadConfigurationFromIngresses(t *testing.T) {
 				},
 			},
 		},
+		{
+			desc:          "v18 Ingress with multiple ingressClasses",
+			serverVersion: "v1.18",
+			expected: &dynamic.Configuration{
+				TCP: &dynamic.TCPConfiguration{},
+				HTTP: &dynamic.HTTPConfiguration{
+					Middlewares: map[string]*dynamic.Middleware{},
+					Routers: map[string]*dynamic.Router{
+						"testing-foo": {
+							Rule:    "PathPrefix(`/foo`)",
+							Service: "testing-service1-80",
+						},
+						"testing-bar": {
+							Rule:    "PathPrefix(`/bar`)",
+							Service: "testing-service1-80",
+						},
+					},
+					Services: map[string]*dynamic.Service{
+						"testing-service1-80": {
+							LoadBalancer: &dynamic.ServersLoadBalancer{
+								PassHostHeader: Bool(true),
+								Servers: []dynamic.Server{
+									{
+										URL: "http://10.10.0.1:8080",
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
 		{
 			desc:          "v18 Ingress with no pathType",
 			serverVersion: "v1.18",

From 2065f4c0035a4e0f079e40054a7e0d3be78a9786 Mon Sep 17 00:00:00 2001
From: Harold Ozouf <harold.ozouf@gmail.com>
Date: Thu, 28 Jan 2021 16:16:05 +0100
Subject: [PATCH 05/14] Fix HTTP challenge router unexpected delayed creation

---
 .../resources/compose/tlsclientheaders.yml    |  2 +-
 integration/tls_client_headers_test.go        |  4 +-
 pkg/provider/aggregator/aggregator.go         | 21 +++--
 pkg/provider/aggregator/aggregator_test.go    | 79 +++++++++++++++++++
 4 files changed, 98 insertions(+), 8 deletions(-)
 create mode 100644 pkg/provider/aggregator/aggregator_test.go

diff --git a/integration/resources/compose/tlsclientheaders.yml b/integration/resources/compose/tlsclientheaders.yml
index f315de749..938ca3cbe 100644
--- a/integration/resources/compose/tlsclientheaders.yml
+++ b/integration/resources/compose/tlsclientheaders.yml
@@ -1,7 +1,7 @@
 whoami:
     image: traefik/whoami
     labels:
-      - traefik.http.routers.route1.rule=PathPrefix(`/`)
+      - traefik.http.routers.route1.rule=PathPrefix(`/foo`)
       - traefik.http.routers.route1.middlewares=passtls
       - traefik.http.routers.route1.tls=true
       - traefik.http.middlewares.passtls.passtlsclientcert.pem=true
diff --git a/integration/tls_client_headers_test.go b/integration/tls_client_headers_test.go
index 9842b777d..f55d2ff99 100644
--- a/integration/tls_client_headers_test.go
+++ b/integration/tls_client_headers_test.go
@@ -50,10 +50,10 @@ func (s *TLSClientHeadersSuite) TestTLSClientHeaders(c *check.C) {
 	c.Assert(err, checker.IsNil)
 	defer s.killCmd(cmd)
 
-	err = try.GetRequest("http://127.0.0.1:8080/api/rawdata", 2*time.Second, try.BodyContains("PathPrefix(`/`)"))
+	err = try.GetRequest("http://127.0.0.1:8080/api/rawdata", 2*time.Second, try.BodyContains("PathPrefix(`/foo`)"))
 	c.Assert(err, checker.IsNil)
 
-	request, err := http.NewRequest(http.MethodGet, "https://127.0.0.1:8443", nil)
+	request, err := http.NewRequest(http.MethodGet, "https://127.0.0.1:8443/foo", nil)
 	c.Assert(err, checker.IsNil)
 
 	certificate, err := tls.LoadX509KeyPair(certPemPath, certKeyPath)
diff --git a/pkg/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go
index 9632af47f..38410f0a8 100644
--- a/pkg/provider/aggregator/aggregator.go
+++ b/pkg/provider/aggregator/aggregator.go
@@ -8,13 +8,15 @@ import (
 	"github.com/traefik/traefik/v2/pkg/log"
 	"github.com/traefik/traefik/v2/pkg/provider"
 	"github.com/traefik/traefik/v2/pkg/provider/file"
+	"github.com/traefik/traefik/v2/pkg/provider/traefik"
 	"github.com/traefik/traefik/v2/pkg/safe"
 )
 
 // ProviderAggregator aggregates providers.
 type ProviderAggregator struct {
-	fileProvider *file.Provider
-	providers    []provider.Provider
+	internalProvider provider.Provider
+	fileProvider     provider.Provider
+	providers        []provider.Provider
 }
 
 // NewProviderAggregator returns an aggregate of all the providers configured in the static configuration.
@@ -98,11 +100,15 @@ func (p *ProviderAggregator) AddProvider(provider provider.Provider) error {
 		return err
 	}
 
-	if fileProvider, ok := provider.(*file.Provider); ok {
-		p.fileProvider = fileProvider
-	} else {
+	switch provider.(type) {
+	case *file.Provider:
+		p.fileProvider = provider
+	case *traefik.Provider:
+		p.internalProvider = provider
+	default:
 		p.providers = append(p.providers, provider)
 	}
+
 	return nil
 }
 
@@ -117,12 +123,17 @@ func (p ProviderAggregator) Provide(configurationChan chan<- dynamic.Message, po
 		launchProvider(configurationChan, pool, p.fileProvider)
 	}
 
+	if p.internalProvider != nil {
+		launchProvider(configurationChan, pool, p.internalProvider)
+	}
+
 	for _, prd := range p.providers {
 		prd := prd
 		safe.Go(func() {
 			launchProvider(configurationChan, pool, prd)
 		})
 	}
+
 	return nil
 }
 
diff --git a/pkg/provider/aggregator/aggregator_test.go b/pkg/provider/aggregator/aggregator_test.go
new file mode 100644
index 000000000..1613ac193
--- /dev/null
+++ b/pkg/provider/aggregator/aggregator_test.go
@@ -0,0 +1,79 @@
+package aggregator
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/stretchr/testify/require"
+	"github.com/traefik/traefik/v2/pkg/config/dynamic"
+	"github.com/traefik/traefik/v2/pkg/provider"
+	"github.com/traefik/traefik/v2/pkg/safe"
+)
+
+func TestProviderAggregator_Provide(t *testing.T) {
+	aggregator := ProviderAggregator{
+		internalProvider: &providerMock{"internal"},
+		fileProvider:     &providerMock{"file"},
+		providers: []provider.Provider{
+			&providerMock{"salad"},
+			&providerMock{"tomato"},
+			&providerMock{"onion"},
+		},
+	}
+
+	cfgCh := make(chan dynamic.Message)
+	errCh := make(chan error)
+	pool := safe.NewPool(context.Background())
+
+	t.Cleanup(pool.Stop)
+
+	go func() {
+		errCh <- aggregator.Provide(cfgCh, pool)
+	}()
+
+	// Make sure the file provider is always called first, followed by the internal provider.
+	requireReceivedMessageFromProviders(t, cfgCh, []string{"file"})
+	requireReceivedMessageFromProviders(t, cfgCh, []string{"internal"})
+
+	// Check if all providers have been called, the order doesn't matter.
+	requireReceivedMessageFromProviders(t, cfgCh, []string{"salad", "tomato", "onion"})
+
+	require.NoError(t, <-errCh)
+}
+
+// requireReceivedMessageFromProviders makes sure the given providers have emitted a message on the given message channel.
+// Providers order is not enforced.
+func requireReceivedMessageFromProviders(t *testing.T, cfgCh <-chan dynamic.Message, names []string) {
+	t.Helper()
+
+	var msg dynamic.Message
+	var receivedMessagesFrom []string
+
+	for range names {
+		select {
+		case <-time.After(10 * time.Millisecond):
+		case msg = <-cfgCh:
+			receivedMessagesFrom = append(receivedMessagesFrom, msg.ProviderName)
+		}
+	}
+
+	require.ElementsMatch(t, names, receivedMessagesFrom)
+}
+
+type providerMock struct {
+	Name string
+}
+
+func (p *providerMock) Init() error {
+	return nil
+}
+
+func (p *providerMock) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error {
+	configurationChan <- dynamic.Message{
+		ProviderName:  p.Name,
+		Configuration: &dynamic.Configuration{},
+	}
+
+	return nil
+}

From 96a346879132939d5561496723251c9208f89b2d Mon Sep 17 00:00:00 2001
From: Harold Ozouf <harold.ozouf@gmail.com>
Date: Mon, 1 Feb 2021 12:36:03 +0100
Subject: [PATCH 06/14] Fix servers transport not found

---
 pkg/provider/aggregator/aggregator.go      | 8 ++++----
 pkg/provider/aggregator/aggregator_test.go | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/provider/aggregator/aggregator.go b/pkg/provider/aggregator/aggregator.go
index 38410f0a8..d000fa8af 100644
--- a/pkg/provider/aggregator/aggregator.go
+++ b/pkg/provider/aggregator/aggregator.go
@@ -119,14 +119,14 @@ func (p ProviderAggregator) Init() error {
 
 // Provide calls the provide method of every providers.
 func (p ProviderAggregator) Provide(configurationChan chan<- dynamic.Message, pool *safe.Pool) error {
-	if p.fileProvider != nil {
-		launchProvider(configurationChan, pool, p.fileProvider)
-	}
-
 	if p.internalProvider != nil {
 		launchProvider(configurationChan, pool, p.internalProvider)
 	}
 
+	if p.fileProvider != nil {
+		launchProvider(configurationChan, pool, p.fileProvider)
+	}
+
 	for _, prd := range p.providers {
 		prd := prd
 		safe.Go(func() {
diff --git a/pkg/provider/aggregator/aggregator_test.go b/pkg/provider/aggregator/aggregator_test.go
index 1613ac193..8aebf6854 100644
--- a/pkg/provider/aggregator/aggregator_test.go
+++ b/pkg/provider/aggregator/aggregator_test.go
@@ -33,8 +33,8 @@ func TestProviderAggregator_Provide(t *testing.T) {
 	}()
 
 	// Make sure the file provider is always called first, followed by the internal provider.
-	requireReceivedMessageFromProviders(t, cfgCh, []string{"file"})
 	requireReceivedMessageFromProviders(t, cfgCh, []string{"internal"})
+	requireReceivedMessageFromProviders(t, cfgCh, []string{"file"})
 
 	// Check if all providers have been called, the order doesn't matter.
 	requireReceivedMessageFromProviders(t, cfgCh, []string{"salad", "tomato", "onion"})

From 73cea2d303f5101a6e3886176ac8a85c9deb56f4 Mon Sep 17 00:00:00 2001
From: Kevin Pollet <pollet.kevin@gmail.com>
Date: Mon, 1 Feb 2021 13:58:03 +0100
Subject: [PATCH 07/14] Fix missing serverstransport documentation

---
 .../reference/dynamic-configuration/docker-labels.yml     | 1 +
 .../dynamic-configuration/kubernetes-crd-resource.yml     | 1 +
 .../reference/dynamic-configuration/marathon-labels.json  | 6 ++++++
 docs/content/reference/static-configuration/file.toml     | 2 +-
 docs/content/reference/static-configuration/file.yaml     | 2 +-
 docs/content/routing/providers/docker.md                  | 8 ++++++++
 docs/content/routing/providers/kubernetes-crd.md          | 1 +
 docs/content/routing/services/index.md                    | 2 +-
 8 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/docs/content/reference/dynamic-configuration/docker-labels.yml b/docs/content/reference/dynamic-configuration/docker-labels.yml
index 885706a0f..1523f7227 100644
--- a/docs/content/reference/dynamic-configuration/docker-labels.yml
+++ b/docs/content/reference/dynamic-configuration/docker-labels.yml
@@ -159,6 +159,7 @@
 - "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.routers.tcprouter0.entrypoints=foobar, foobar"
 - "traefik.tcp.routers.tcprouter0.rule=foobar"
 - "traefik.tcp.routers.tcprouter0.service=foobar"
diff --git a/docs/content/reference/dynamic-configuration/kubernetes-crd-resource.yml b/docs/content/reference/dynamic-configuration/kubernetes-crd-resource.yml
index eb6294556..cbe4b3e34 100644
--- a/docs/content/reference/dynamic-configuration/kubernetes-crd-resource.yml
+++ b/docs/content/reference/dynamic-configuration/kubernetes-crd-resource.yml
@@ -96,6 +96,7 @@ spec:
           strategy: RoundRobin
         - name: s2
           port: 433
+          serversTransport: mytransport
     - match: PathPrefix(`/misc`)
       services:
         - name: s3
diff --git a/docs/content/reference/dynamic-configuration/marathon-labels.json b/docs/content/reference/dynamic-configuration/marathon-labels.json
index 3e9644840..f2771f34b 100644
--- a/docs/content/reference/dynamic-configuration/marathon-labels.json
+++ b/docs/content/reference/dynamic-configuration/marathon-labels.json
@@ -37,6 +37,7 @@
 "traefik.http.middlewares.middleware10.headers.accesscontrolallowmethods": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolalloworigin": "foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolalloworiginlist": "foobar, foobar",
+"traefik.http.middlewares.middleware10.headers.accesscontrolalloworiginlistregex": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolexposeheaders": "foobar, foobar",
 "traefik.http.middlewares.middleware10.headers.accesscontrolmaxage": "42",
 "traefik.http.middlewares.middleware10.headers.addvaryheader": "true",
@@ -120,6 +121,7 @@
 "traefik.http.routers.router0.priority": "42",
 "traefik.http.routers.router0.rule": "foobar",
 "traefik.http.routers.router0.service": "foobar",
+"traefik.http.routers.router0.tls": "true",
 "traefik.http.routers.router0.tls.certresolver": "foobar",
 "traefik.http.routers.router0.tls.domains[0].main": "foobar",
 "traefik.http.routers.router0.tls.domains[0].sans": "foobar, foobar",
@@ -131,6 +133,7 @@
 "traefik.http.routers.router1.priority": "42",
 "traefik.http.routers.router1.rule": "foobar",
 "traefik.http.routers.router1.service": "foobar",
+"traefik.http.routers.router1.tls": "true",
 "traefik.http.routers.router1.tls.certresolver": "foobar",
 "traefik.http.routers.router1.tls.domains[0].main": "foobar",
 "traefik.http.routers.router1.tls.domains[0].sans": "foobar, foobar",
@@ -156,9 +159,11 @@
 "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.routers.tcprouter0.entrypoints": "foobar, foobar",
 "traefik.tcp.routers.tcprouter0.rule": "foobar",
 "traefik.tcp.routers.tcprouter0.service": "foobar",
+"traefik.tcp.routers.tcprouter0.tls": "true",
 "traefik.tcp.routers.tcprouter0.tls.certresolver": "foobar",
 "traefik.tcp.routers.tcprouter0.tls.domains[0].main": "foobar",
 "traefik.tcp.routers.tcprouter0.tls.domains[0].sans": "foobar, foobar",
@@ -169,6 +174,7 @@
 "traefik.tcp.routers.tcprouter1.entrypoints": "foobar, foobar",
 "traefik.tcp.routers.tcprouter1.rule": "foobar",
 "traefik.tcp.routers.tcprouter1.service": "foobar",
+"traefik.tcp.routers.tcprouter1.tls": "true",
 "traefik.tcp.routers.tcprouter1.tls.certresolver": "foobar",
 "traefik.tcp.routers.tcprouter1.tls.domains[0].main": "foobar",
 "traefik.tcp.routers.tcprouter1.tls.domains[0].sans": "foobar, foobar",
diff --git a/docs/content/reference/static-configuration/file.toml b/docs/content/reference/static-configuration/file.toml
index ceacd0198..d54b7d356 100644
--- a/docs/content/reference/static-configuration/file.toml
+++ b/docs/content/reference/static-configuration/file.toml
@@ -380,6 +380,7 @@
   token = "foobar"
 
 [experimental]
+  kubernetesGateway = true
   [experimental.plugins]
     [experimental.plugins.Descriptor0]
       moduleName = "foobar"
@@ -390,4 +391,3 @@
   [experimental.devPlugin]
     goPath = "foobar"
     moduleName = "foobar"
-  kubernetesGateway = true
diff --git a/docs/content/reference/static-configuration/file.yaml b/docs/content/reference/static-configuration/file.yaml
index e2011bc1a..5f4749ade 100644
--- a/docs/content/reference/static-configuration/file.yaml
+++ b/docs/content/reference/static-configuration/file.yaml
@@ -400,6 +400,7 @@ certificatesResolvers:
 pilot:
   token: foobar
 experimental:
+  kubernetesGateway: true
   plugins:
     Descriptor0:
       moduleName: foobar
@@ -410,5 +411,4 @@ experimental:
   devPlugin:
     goPath: foobar
     moduleName: foobar
-  kubernetesGateway: true
 
diff --git a/docs/content/routing/providers/docker.md b/docs/content/routing/providers/docker.md
index 21f986a56..ed39ba823 100644
--- a/docs/content/routing/providers/docker.md
+++ b/docs/content/routing/providers/docker.md
@@ -285,6 +285,14 @@ you'd add the label `traefik.http.services.<name-of-your-choice>.loadbalancer.pa
     - "traefik.http.services.myservice.loadbalancer.server.scheme=http"
     ```
 
+??? info "`traefik.http.services.<service_name>.loadbalancer.serverstransport`"
+
+    See [serverstransport](../services/index.md#serverstransport) for more information.
+
+    ```yaml
+    - "traefik.http.services.<service_name>.loadbalancer.serverstransport=foobar"
+    ```
+
 ??? info "`traefik.http.services.<service_name>.loadbalancer.passhostheader`"
 
     See [pass Host header](../services/index.md#pass-host-header) for more information.
diff --git a/docs/content/routing/providers/kubernetes-crd.md b/docs/content/routing/providers/kubernetes-crd.md
index 2a1cb3862..dcf795f27 100644
--- a/docs/content/routing/providers/kubernetes-crd.md
+++ b/docs/content/routing/providers/kubernetes-crd.md
@@ -335,6 +335,7 @@ Register the `IngressRoute` [kind](../../reference/dynamic-configuration/kuberne
           responseForwarding:
             flushInterval: 1ms
           scheme: https
+          serversTransport: transport
           sticky:
             cookie:
               httpOnly: true
diff --git a/docs/content/routing/services/index.md b/docs/content/routing/services/index.md
index 9c59e4a1d..b2e0287ab 100644
--- a/docs/content/routing/services/index.md
+++ b/docs/content/routing/services/index.md
@@ -462,7 +462,7 @@ By default, `passHostHeader` is true.
 
 #### ServersTransport
 
-`serversTransport` allows to reference a ServersTransport configuration for the communication between Traefik and your servers.
+`serversTransport` allows to reference a [ServersTransport](./index.md#serverstransport_1) configuration for the communication between Traefik and your servers.
 
 ??? example "Specify a transport -- Using the [File Provider](../../providers/file.md)"
 

From ea8642e2a17bb1e6b535b31db30bf22d065866fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20BUISSON?= <remi-buisson@orange.fr>
Date: Mon, 1 Feb 2021 14:42:04 +0100
Subject: [PATCH 08/14] fix: reduce pressure of pilot services when errors
 occurs

---
 pkg/pilot/pilot.go | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkg/pilot/pilot.go b/pkg/pilot/pilot.go
index 73d6876bb..9edd984c6 100644
--- a/pkg/pilot/pilot.go
+++ b/pkg/pilot/pilot.go
@@ -33,6 +33,8 @@ const (
 	pilotInstanceInfoTimer = 5 * time.Minute
 	pilotDynConfTimer      = 12 * time.Hour
 	maxElapsedTime         = 4 * time.Minute
+	initialInterval        = 5 * time.Second
+	multiplier             = 3
 )
 
 type instanceInfo struct {
@@ -219,6 +221,8 @@ func (c *client) SendInstanceInfo(ctx context.Context, pilotMetrics []metrics.Pi
 func (c *client) sendDataRetryable(ctx context.Context, req *http.Request) error {
 	exponentialBackOff := backoff.NewExponentialBackOff()
 	exponentialBackOff.MaxElapsedTime = maxElapsedTime
+	exponentialBackOff.InitialInterval = initialInterval
+	exponentialBackOff.Multiplier = multiplier
 
 	req.Header.Set("Content-Type", "application/json")
 	req.Header.Set(tokenHashHeader, c.tokenHash)

From c53033a7783f7e8d536b29d3bfac3a9170665f92 Mon Sep 17 00:00:00 2001
From: Romain <rtribotte@users.noreply.github.com>
Date: Mon, 1 Feb 2021 16:50:03 +0100
Subject: [PATCH 09/14] Fix aggregator test comment

---
 pkg/provider/aggregator/aggregator_test.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/provider/aggregator/aggregator_test.go b/pkg/provider/aggregator/aggregator_test.go
index 8aebf6854..a88a791ba 100644
--- a/pkg/provider/aggregator/aggregator_test.go
+++ b/pkg/provider/aggregator/aggregator_test.go
@@ -32,7 +32,7 @@ func TestProviderAggregator_Provide(t *testing.T) {
 		errCh <- aggregator.Provide(cfgCh, pool)
 	}()
 
-	// Make sure the file provider is always called first, followed by the internal provider.
+	// Make sure the internal provider is always called first, followed by the file provider.
 	requireReceivedMessageFromProviders(t, cfgCh, []string{"internal"})
 	requireReceivedMessageFromProviders(t, cfgCh, []string{"file"})
 

From 4cabea069d9734958da19a09f039d20ca44ed80a Mon Sep 17 00:00:00 2001
From: Romain <rtribotte@users.noreply.github.com>
Date: Mon, 1 Feb 2021 17:14:04 +0100
Subject: [PATCH 10/14] Prepare Release v2.4.1

---
 CHANGELOG.md                   | 20 ++++++++++++++++++++
 script/gcg/traefik-bugfix.toml | 10 +++++-----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf1fc4950..753d678bd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,23 @@
+## [v2.4.1](https://github.com/traefik/traefik/tree/v2.4.1) (2021-02-01)
+[All Commits](https://github.com/traefik/traefik/compare/v2.4.0...v2.4.1)
+
+**Bug fixes:**
+- **[acme,provider]** Fix HTTP challenge router unexpected delayed creation ([#7805](https://github.com/traefik/traefik/pull/7805) by [jspdown](https://github.com/jspdown))
+- **[acme]** Update go-acme/lego to v4.2.0 ([#7793](https://github.com/traefik/traefik/pull/7793) by [ldez](https://github.com/ldez))
+- **[api,plugins]** Fix plugin type on middleware endpoint response ([#7782](https://github.com/traefik/traefik/pull/7782) by [jspdown](https://github.com/jspdown))
+- **[authentication,middleware]** Forward Proxy-Authorization header to authentication server ([#7433](https://github.com/traefik/traefik/pull/7433) by [Scapal](https://github.com/Scapal))
+- **[k8s,k8s/ingress]** Add support for multiple ingress classes ([#7799](https://github.com/traefik/traefik/pull/7799) by [LandryBe](https://github.com/LandryBe))
+- **[middleware]** Improve forwarded header and recovery middlewares performances ([#7783](https://github.com/traefik/traefik/pull/7783) by [juliens](https://github.com/juliens))
+- **[pilot]** Reduce pressure of pilot services when errors occurs ([#7824](https://github.com/traefik/traefik/pull/7824) by [darkweaver87](https://github.com/darkweaver87))
+- **[provider]** Fix aggregator test comment ([#7840](https://github.com/traefik/traefik/pull/7840) by [rtribotte](https://github.com/rtribotte))
+- **[provider]** Fix servers transport not found ([#7839](https://github.com/traefik/traefik/pull/7839) by [jspdown](https://github.com/jspdown))
+
+**Documentation:**
+- **[consulcatalog]** Fix refresh interval option description in consulcatalog provider ([#7810](https://github.com/traefik/traefik/pull/7810) by [GabeL7r](https://github.com/GabeL7r))
+- **[docker]** Fix missing serverstransport documentation ([#7822](https://github.com/traefik/traefik/pull/7822) by [kevinpollet](https://github.com/kevinpollet))
+- **[k8s]** Fix YAML syntax in providers docs ([#7787](https://github.com/traefik/traefik/pull/7787) by [4ops](https://github.com/4ops))
+- **[service]** Fix typo in server transports documentation ([#7797](https://github.com/traefik/traefik/pull/7797) by [obezuk](https://github.com/obezuk))
+
 ## [v2.4.0](https://github.com/traefik/traefik/tree/v2.4.0) (2021-01-19)
 [All Commits](https://github.com/traefik/traefik/compare/v2.3.0-rc1...v2.4.0)
 
diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml
index 26b630d2d..d0477e934 100644
--- a/script/gcg/traefik-bugfix.toml
+++ b/script/gcg/traefik-bugfix.toml
@@ -4,11 +4,11 @@ RepositoryName = "traefik"
 OutputType = "file"
 FileName = "traefik_changelog.md"
 
-# example new bugfix v2.3.7
-CurrentRef = "v2.3"
-PreviousRef = "v2.3.6"
-BaseBranch = "v2.3"
-FutureCurrentRefName = "v2.3.7"
+# example new bugfix v2.4.1
+CurrentRef = "v2.4"
+PreviousRef = "v2.4.0"
+BaseBranch = "v2.4"
+FutureCurrentRefName = "v2.4.1"
 
 ThresholdPreviousRef = 10
 ThresholdCurrentRef = 10

From bf4a578bbbb014483903c2266a68762831870fbe Mon Sep 17 00:00:00 2001
From: Ludovic Fernandez <ldez@users.noreply.github.com>
Date: Tue, 2 Feb 2021 11:40:04 +0100
Subject: [PATCH 11/14] fix: infinite loop in forwarded header middleware.

Co-authored-by: kevinpollet <pollet.kevin@gmail.com>
---
 .../forwardedheaders/forwarded_header.go      |  3 +-
 .../forwardedheaders/forwarded_header_test.go | 69 +++++++++++++++++++
 2 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/pkg/middlewares/forwardedheaders/forwarded_header.go b/pkg/middlewares/forwardedheaders/forwarded_header.go
index 5d2355dfd..2a36859c4 100644
--- a/pkg/middlewares/forwardedheaders/forwarded_header.go
+++ b/pkg/middlewares/forwardedheaders/forwarded_header.go
@@ -104,9 +104,10 @@ func isWebsocketRequest(req *http.Request) bool {
 				return true
 			}
 
-			h = h[pos:]
+			h = h[pos+1:]
 		}
 	}
+
 	return containsHeader(connection, "upgrade") && containsHeader(upgrade, "websocket")
 }
 
diff --git a/pkg/middlewares/forwardedheaders/forwarded_header_test.go b/pkg/middlewares/forwardedheaders/forwarded_header_test.go
index 8fc290f63..40e2c323a 100644
--- a/pkg/middlewares/forwardedheaders/forwarded_header_test.go
+++ b/pkg/middlewares/forwardedheaders/forwarded_header_test.go
@@ -3,6 +3,7 @@ package forwardedheaders
 import (
 	"crypto/tls"
 	"net/http"
+	"net/http/httptest"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -299,3 +300,71 @@ func TestServeHTTP(t *testing.T) {
 		})
 	}
 }
+
+func Test_isWebsocketRequest(t *testing.T) {
+	testCases := []struct {
+		desc             string
+		connectionHeader string
+		upgradeHeader    string
+		assert           assert.BoolAssertionFunc
+	}{
+		{
+			desc:             "connection Header multiple values middle",
+			connectionHeader: "foo,upgrade,bar",
+			upgradeHeader:    "websocket",
+			assert:           assert.True,
+		},
+		{
+			desc:             "connection Header multiple values end",
+			connectionHeader: "foo,bar,upgrade",
+			upgradeHeader:    "websocket",
+			assert:           assert.True,
+		},
+		{
+			desc:             "connection Header multiple values begin",
+			connectionHeader: "upgrade,foo,bar",
+			upgradeHeader:    "websocket",
+			assert:           assert.True,
+		},
+		{
+			desc:             "connection Header no upgrade",
+			connectionHeader: "foo,bar",
+			upgradeHeader:    "websocket",
+			assert:           assert.False,
+		},
+		{
+			desc:             "connection Header empty",
+			connectionHeader: "",
+			upgradeHeader:    "websocket",
+			assert:           assert.False,
+		},
+		{
+			desc:             "no header values",
+			connectionHeader: "foo,bar",
+			upgradeHeader:    "foo,bar",
+			assert:           assert.False,
+		},
+		{
+			desc:             "upgrade header multiple values",
+			connectionHeader: "upgrade",
+			upgradeHeader:    "foo,bar,websocket",
+			assert:           assert.True,
+		},
+	}
+
+	for _, test := range testCases {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+
+			req := httptest.NewRequest(http.MethodGet, "http://localhost", nil)
+
+			req.Header.Set(connection, test.connectionHeader)
+			req.Header.Set(upgrade, test.upgradeHeader)
+
+			ok := isWebsocketRequest(req)
+
+			test.assert(t, ok)
+		})
+	}
+}

From 3c5e6fe7f8e655067aa7663d23452b9e5fc0cf94 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:10:03 +0100
Subject: [PATCH 12/14] Fix the static configuration generation for environment
 variables

---
 docs/content/reference/static-configuration/env-ref.md | 4 ++--
 internal/gendoc.go                                     | 7 ++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/docs/content/reference/static-configuration/env-ref.md b/docs/content/reference/static-configuration/env-ref.md
index 786a123ba..b3cc34b1f 100644
--- a/docs/content/reference/static-configuration/env-ref.md
+++ b/docs/content/reference/static-configuration/env-ref.md
@@ -135,10 +135,10 @@ Default certificate resolver for the routers linked to the entry point.
 `TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS`:  
 Default TLS domains for the routers linked to the entry point.
 
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS[n]_MAIN`:  
+`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS_n_MAIN`:  
 Default subject name.
 
-`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS[n]_SANS`:  
+`TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_DOMAINS_n_SANS`:  
 Subject alternative names.
 
 `TRAEFIK_ENTRYPOINTS_<NAME>_HTTP_TLS_OPTIONS`:  
diff --git a/internal/gendoc.go b/internal/gendoc.go
index 3e7e51bab..6e6290ec3 100644
--- a/internal/gendoc.go
+++ b/internal/gendoc.go
@@ -64,7 +64,12 @@ THIS FILE MUST NOT BE EDITED BY HAND
 			continue
 		}
 
-		w.writeln("`" + prefix + strings.ReplaceAll(flat.Name, "[0]", "[n]") + "`:  ")
+		if prefix == "" {
+			w.writeln("`" + prefix + strings.ReplaceAll(flat.Name, "[0]", "_n") + "`:  ")
+		} else {
+			w.writeln("`" + prefix + strings.ReplaceAll(flat.Name, "[0]", "[n]") + "`:  ")
+		}
+
 		if flat.Default == "" {
 			w.writeln(flat.Description)
 		} else {

From 447c3567b45ed004b62fa12d048eaf9bf2fbc704 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
Date: Tue, 2 Feb 2021 17:42:04 +0100
Subject: [PATCH 13/14] Fix the redirect entrypoint default priority

---
 pkg/config/static/entrypoints.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg/config/static/entrypoints.go b/pkg/config/static/entrypoints.go
index f55bfc3dc..3823cb4d6 100644
--- a/pkg/config/static/entrypoints.go
+++ b/pkg/config/static/entrypoints.go
@@ -71,7 +71,7 @@ type RedirectEntryPoint struct {
 func (r *RedirectEntryPoint) SetDefaults() {
 	r.Scheme = "https"
 	r.Permanent = true
-	r.Priority = math.MaxInt32
+	r.Priority = math.MaxInt32 - 1
 }
 
 // TLSConfig is the default TLS configuration for all the routers associated to the concerned entry point.

From f482e5e84a6aa1e5a5bd547883d9c1cb16ba20b0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Doumenjou <925513+jbdoumenjou@users.noreply.github.com>
Date: Tue, 2 Feb 2021 18:06:04 +0100
Subject: [PATCH 14/14] Prepare release v2.4.2

---
 CHANGELOG.md                   | 10 ++++++++++
 script/gcg/traefik-bugfix.toml |  6 +++---
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 753d678bd..8dc27413b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [v2.4.2](https://github.com/traefik/traefik/tree/v2.4.2) (2021-02-02)
+[All Commits](https://github.com/traefik/traefik/compare/v2.4.1...v2.4.2)
+
+**Bug fixes:**
+- **[acme]** Fix the redirect entrypoint default priority ([#7851](https://github.com/traefik/traefik/pull/7851) by [jbdoumenjou](https://github.com/jbdoumenjou))
+- **[middleware]** Fix the infinite loop in forwarded header middleware. ([#7847](https://github.com/traefik/traefik/pull/7847) by [ldez](https://github.com/ldez))
+
+**Documentation:**
+- Fix the static configuration generation for environment variables ([#7849](https://github.com/traefik/traefik/pull/7849) by [jbdoumenjou](https://github.com/jbdoumenjou))
+
 ## [v2.4.1](https://github.com/traefik/traefik/tree/v2.4.1) (2021-02-01)
 [All Commits](https://github.com/traefik/traefik/compare/v2.4.0...v2.4.1)
 
diff --git a/script/gcg/traefik-bugfix.toml b/script/gcg/traefik-bugfix.toml
index d0477e934..905028594 100644
--- a/script/gcg/traefik-bugfix.toml
+++ b/script/gcg/traefik-bugfix.toml
@@ -4,11 +4,11 @@ RepositoryName = "traefik"
 OutputType = "file"
 FileName = "traefik_changelog.md"
 
-# example new bugfix v2.4.1
+# example new bugfix v2.4.2
 CurrentRef = "v2.4"
-PreviousRef = "v2.4.0"
+PreviousRef = "v2.4.1"
 BaseBranch = "v2.4"
-FutureCurrentRefName = "v2.4.1"
+FutureCurrentRefName = "v2.4.2"
 
 ThresholdPreviousRef = 10
 ThresholdCurrentRef = 10