Merge branch v2.10 into v3.0

pkg/config/static/static_config.go

@@ -136,9 +136,10 @@ type TLSClientConfig struct {
 
 // API holds the API configuration.
 type API struct {
-	Insecure  bool `description:"Activate API directly on the entryPoint named traefik." json:"insecure,omitempty" toml:"insecure,omitempty" yaml:"insecure,omitempty" export:"true"`
-	Dashboard bool `description:"Activate dashboard." json:"dashboard,omitempty" toml:"dashboard,omitempty" yaml:"dashboard,omitempty" export:"true"`
-	Debug     bool `description:"Enable additional endpoints for debugging and profiling." json:"debug,omitempty" toml:"debug,omitempty" yaml:"debug,omitempty" export:"true"`
+	Insecure           bool `description:"Activate API directly on the entryPoint named traefik." json:"insecure,omitempty" toml:"insecure,omitempty" yaml:"insecure,omitempty" export:"true"`
+	Dashboard          bool `description:"Activate dashboard." json:"dashboard,omitempty" toml:"dashboard,omitempty" yaml:"dashboard,omitempty" export:"true"`
+	Debug              bool `description:"Enable additional endpoints for debugging and profiling." json:"debug,omitempty" toml:"debug,omitempty" yaml:"debug,omitempty" export:"true"`
+	DisableDashboardAd bool `description:"Disable ad in the dashboard." json:"disableDashboardAd,omitempty" toml:"disableDashboardAd,omitempty" yaml:"disableDashboardAd,omitempty" export:"true"`
 	// TODO: Re-enable statistics
 	// Statistics      *types.Statistics `description:"Enable more detailed statistics." json:"statistics,omitempty" toml:"statistics,omitempty" yaml:"statistics,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"`
 }

pkg/provider/kubernetes/ingress/kubernetes.go

@@ -525,6 +525,15 @@ func getTLSConfig(tlsConfigs map[string]*tls.CertAndStores) []*tls.CertAndStores
 }
 
 func (p *Provider) loadService(client Client, namespace string, backend netv1.IngressBackend) (*dynamic.Service, error) {
+	if backend.Resource != nil {
+		// https://kubernetes.io/docs/concepts/services-networking/ingress/#resource-backend
+		return nil, errors.New("resource backends are not supported")
+	}
+
+	if backend.Service == nil {
+		return nil, errors.New("missing service definition")
+	}
+
 	service, exists, err := client.GetService(namespace, backend.Service.Name)
 	if err != nil {
 		return nil, err

pkg/server/middleware/middlewares.go

@@ -364,7 +364,7 @@ func (b *Builder) buildConstructor(ctx context.Context, middlewareName string) (
 		}
 
 		middleware = func(next http.Handler) (http.Handler, error) {
-			return plug(ctx, next)
+			return newTraceablePlugin(ctx, middlewareName, plug, next)
 		}
 	}
 

pkg/server/middleware/plugins.go

@@ -1,10 +1,14 @@
 package middleware
 
 import (
+	"context"
 	"errors"
+	"net/http"
 
+	"github.com/opentracing/opentracing-go/ext"
 	"github.com/traefik/traefik/v3/pkg/config/dynamic"
 	"github.com/traefik/traefik/v3/pkg/plugins"
+	"github.com/traefik/traefik/v3/pkg/tracing"
 )
 
 // PluginsBuilder the plugin's builder interface.
@@ -31,3 +35,25 @@ func findPluginConfig(rawConfig map[string]dynamic.PluginConf) (string, map[stri
 
 	return pluginType, rawPluginConfig, nil
 }
+
+type traceablePlugin struct {
+	name string
+	h    http.Handler
+}
+
+func newTraceablePlugin(ctx context.Context, name string, plug plugins.Constructor, next http.Handler) (*traceablePlugin, error) {
+	h, err := plug(ctx, next)
+	if err != nil {
+		return nil, err
+	}
+
+	return &traceablePlugin{name: name, h: h}, nil
+}
+
+func (s *traceablePlugin) ServeHTTP(rw http.ResponseWriter, req *http.Request) {
+	s.h.ServeHTTP(rw, req)
+}
+
+func (s *traceablePlugin) GetTracingInformation() (string, ext.SpanKindEnum) {
+	return s.name, tracing.SpanKindNoneEnum
+}

pkg/version/version.go

@@ -22,7 +22,8 @@ var (
 	BuildDate = "I don't remember exactly"
 	// StartDate holds the start date of traefik.
 	StartDate = time.Now()
-	// UUID instance uuid.
+	// DisableDashboardAd disables ad in the dashboard.
+	DisableDashboardAd = false
 )
 
 // Handler expose version routes.
@@ -37,14 +38,16 @@ func (v Handler) Append(router *mux.Router) {
 	router.Methods(http.MethodGet).Path("/api/version").
 		HandlerFunc(func(response http.ResponseWriter, request *http.Request) {
 			v := struct {
-				Version   string
-				Codename  string
-				StartDate time.Time `json:"startDate"`
-				UUID      string    `json:"uuid,omitempty"`
+				Version            string
+				Codename           string
+				StartDate          time.Time `json:"startDate"`
+				UUID               string    `json:"uuid,omitempty"`
+				DisableDashboardAd bool      `json:"disableDashboardAd,omitempty"`
 			}{
-				Version:   Version,
-				Codename:  Codename,
-				StartDate: StartDate,
+				Version:            Version,
+				Codename:           Codename,
+				StartDate:          StartDate,
+				DisableDashboardAd: DisableDashboardAd,
 			}
 
 			if err := templatesRenderer.JSON(response, http.StatusOK, v); err != nil {