Merge branch v2.9 into master

pkg/config/dynamic/middlewares.go

@@ -416,7 +416,7 @@ type InFlightReq struct {
 // This middleware adds the selected data from the passed client TLS certificate to a header.
 // More info: https://doc.traefik.io/traefik/v2.9/middlewares/http/passtlsclientcert/
 type PassTLSClientCert struct {
-	// PEM sets the X-Forwarded-Tls-Client-Cert header with the escaped certificate.
+	// PEM sets the X-Forwarded-Tls-Client-Cert header with the certificate.
 	PEM bool `json:"pem,omitempty" toml:"pem,omitempty" yaml:"pem,omitempty" export:"true"`
 	// Info selects the specific client certificate details you want to add to the X-Forwarded-Tls-Client-Cert-Info header.
 	Info *TLSClientCertificateInfo `json:"info,omitempty" toml:"info,omitempty" yaml:"info,omitempty" export:"true"`

pkg/log/deprecated.go

@@ -9,67 +9,67 @@ import (
 )
 
 // Debug logs a message at level Debug on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Debug(...) instead.
 func Debug(args ...interface{}) {
 	mainLogger.Debug(args...)
 }
 
 // Debugf logs a message at level Debug on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Debugf(...) instead.
 func Debugf(format string, args ...interface{}) {
 	mainLogger.Debugf(format, args...)
 }
 
 // Info logs a message at level Info on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Info(...) instead.
 func Info(args ...interface{}) {
 	mainLogger.Info(args...)
 }
 
 // Infof logs a message at level Info on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Infof(...) instead.
 func Infof(format string, args ...interface{}) {
 	mainLogger.Infof(format, args...)
 }
 
 // Warn logs a message at level Warn on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Warn(...) instead.
 func Warn(args ...interface{}) {
 	mainLogger.Warn(args...)
 }
 
 // Warnf logs a message at level Warn on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Warnf(...) instead.
 func Warnf(format string, args ...interface{}) {
 	mainLogger.Warnf(format, args...)
 }
 
 // Error logs a message at level Error on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Error(...) instead.
 func Error(args ...interface{}) {
 	mainLogger.Error(args...)
 }
 
 // Errorf logs a message at level Error on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Errorf(...) instead.
 func Errorf(format string, args ...interface{}) {
 	mainLogger.Errorf(format, args...)
 }
 
 // Panic logs a message at level Panic on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Panic(...) instead.
 func Panic(args ...interface{}) {
 	mainLogger.Panic(args...)
 }
 
 // Fatal logs a message at level Fatal on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Fatal(...) instead.
 func Fatal(args ...interface{}) {
 	mainLogger.Fatal(args...)
 }
 
 // Fatalf logs a message at level Fatal on the standard logger.
-// Deprecated
+// Deprecated: use log.FromContext(ctx).Fatalf(...) instead.
 func Fatalf(format string, args ...interface{}) {
 	mainLogger.Fatalf(format, args...)
 }

pkg/middlewares/passtlsclientcert/pass_tls_client_cert.go

@@ -325,13 +325,11 @@ func writePart(ctx context.Context, content io.StringWriter, entry, prefix strin
 
 // sanitize As we pass the raw certificates, remove the useless data and make it http request compliant.
 func sanitize(cert []byte) string {
-	cleaned := strings.NewReplacer(
+	return strings.NewReplacer(
 		"-----BEGIN CERTIFICATE-----", "",
 		"-----END CERTIFICATE-----", "",
 		"\n", "",
 	).Replace(string(cert))
-
-	return url.QueryEscape(cleaned)
 }
 
 // getCertificates Build a string with the client certificates.

pkg/middlewares/passtlsclientcert/pass_tls_client_cert_test.go

@@ -610,7 +610,7 @@ WqeUSNGYV//RunTeuRDAf5OxehERb1srzBXhRZ3cZdzXbgR/`,
 
 			content := sanitize(test.toSanitize)
 
-			expected := url.QueryEscape(strings.ReplaceAll(test.expected, "\n", ""))
+			expected := strings.ReplaceAll(test.expected, "\n", "")
 			assert.Equal(t, expected, content, "The sanitized certificates should be equal")
 		})
 	}

pkg/provider/docker/builder_test.go

@@ -47,12 +47,6 @@ func nodeIP(ip string) func(*docker.ContainerJSON) {
 	}
 }
 
-func labels(labels map[string]string) func(*docker.ContainerJSON) {
-	return func(c *docker.ContainerJSON) {
-		c.Config.Labels = labels
-	}
-}
-
 func ports(portMap nat.PortMap) func(*docker.ContainerJSON) {
 	return func(c *docker.ContainerJSON) {
 		c.NetworkSettings.NetworkSettingsBase.Ports = portMap

pkg/provider/kv/redis/redis.go

@@ -30,7 +30,7 @@ func (p *Provider) SetDefaults() {
 
 // Init the provider.
 func (p *Provider) Init() error {
-	config := redis.Config{
+	config := &redis.Config{
 		Username: p.Username,
 		Password: p.Password,
 		DB:       p.DB,