Merge current v2.7 into master

pkg/config/static/hub.go

@@ -0,0 +1,53 @@
+package static
+
+import (
+	"errors"
+
+	"github.com/traefik/traefik/v2/pkg/log"
+	"github.com/traefik/traefik/v2/pkg/provider/hub"
+)
+
+func (c *Configuration) initHubProvider() error {
+	// Hub provider is an experimental feature. It requires the experimental flag to be enabled before continuing.
+	if c.Experimental == nil || !c.Experimental.Hub {
+		return errors.New("the experimental flag for Hub is not set")
+	}
+
+	if _, ok := c.EntryPoints[hub.TunnelEntrypoint]; !ok {
+		var ep EntryPoint
+		ep.SetDefaults()
+		ep.Address = ":9901"
+		c.EntryPoints[hub.TunnelEntrypoint] = &ep
+		log.WithoutContext().Infof("The entryPoint %q is created on port 9901 to allow exposition of services.", hub.TunnelEntrypoint)
+	}
+
+	if c.Hub.TLS == nil {
+		return nil
+	}
+
+	if c.Hub.TLS.Insecure && (c.Hub.TLS.CA != "" || c.Hub.TLS.Cert != "" || c.Hub.TLS.Key != "") {
+		return errors.New("mTLS configuration for Hub and insecure TLS for Hub are mutually exclusive")
+	}
+
+	if !c.Hub.TLS.Insecure && (c.Hub.TLS.CA == "" || c.Hub.TLS.Cert == "" || c.Hub.TLS.Key == "") {
+		return errors.New("incomplete mTLS configuration for Hub")
+	}
+
+	if c.Hub.TLS.Insecure {
+		log.WithoutContext().Warn("Hub is in `insecure` mode. Do not run in production with this setup.")
+	}
+
+	if _, ok := c.EntryPoints[hub.APIEntrypoint]; !ok {
+		var ep EntryPoint
+		ep.SetDefaults()
+		ep.Address = ":9900"
+		c.EntryPoints[hub.APIEntrypoint] = &ep
+		log.WithoutContext().Infof("The entryPoint %q is created on port 9900 to allow Traefik to communicate with the Hub Agent for Traefik.", hub.APIEntrypoint)
+	}
+
+	c.EntryPoints[hub.APIEntrypoint].HTTP.TLS = &TLSConfig{
+		Options: "traefik-hub",
+	}
+
+	return nil
+}

pkg/config/static/pilot.go

@@ -1,7 +1,6 @@
 package static
 
 // Pilot Configuration related to Traefik Pilot.
-// Deprecated.
 type Pilot struct {
 	Token     string `description:"Traefik Pilot token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty" loggable:"false"`
 	Dashboard bool   `description:"Enable Traefik Pilot in the dashboard." json:"dashboard,omitempty" toml:"dashboard,omitempty" yaml:"dashboard,omitempty"`

pkg/config/static/static_config.go

@@ -1,7 +1,6 @@
 package static
 
 import (
-	"errors"
 	"fmt"
 	stdlog "log"
 	"strings"
@@ -78,7 +77,6 @@ type Configuration struct {
 
 	CertificatesResolvers map[string]CertificateResolver `description:"Certificates resolvers configuration." json:"certificatesResolvers,omitempty" toml:"certificatesResolvers,omitempty" yaml:"certificatesResolvers,omitempty" export:"true"`
 
-	// Deprecated.
 	Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omitempty" toml:"pilot,omitempty" yaml:"pilot,omitempty" export:"true"`
 
 	Hub *hub.Provider `description:"Traefik Hub configuration." json:"hub,omitempty" toml:"hub,omitempty" yaml:"hub,omitempty" label:"allowEmpty" file:"allowEmpty" export:"true"`
@@ -201,7 +199,7 @@ type Providers struct {
 // It also takes care of maintaining backwards compatibility.
 func (c *Configuration) SetEffectiveConfiguration() {
 	// Creates the default entry point if needed
-	if len(c.EntryPoints) == 0 || (c.Hub != nil && len(c.EntryPoints) == 1 && c.EntryPoints[c.Hub.EntryPoint] != nil) {
+	if !c.hasUserDefinedEntrypoint() {
 		ep := &EntryPoint{Address: ":80"}
 		ep.SetDefaults()
 		// TODO: double check this tomorrow
@@ -287,6 +285,21 @@ func (c *Configuration) SetEffectiveConfiguration() {
 	c.initACMEProvider()
 }
 
+func (c *Configuration) hasUserDefinedEntrypoint() bool {
+	if len(c.EntryPoints) == 0 {
+		return false
+	}
+
+	switch len(c.EntryPoints) {
+	case 1:
+		return c.EntryPoints[hub.TunnelEntrypoint] == nil
+	case 2:
+		return c.EntryPoints[hub.TunnelEntrypoint] == nil || c.EntryPoints[hub.APIEntrypoint] == nil
+	default:
+		return true
+	}
+}
+
 func (c *Configuration) initACMEProvider() {
 	for _, resolver := range c.CertificatesResolvers {
 		if resolver.ACME != nil {
@@ -297,46 +310,6 @@ func (c *Configuration) initACMEProvider() {
 	legolog.Logger = stdlog.New(log.WithoutContext().WriterLevel(logrus.DebugLevel), "legolog: ", 0)
 }
 
-func (c *Configuration) initHubProvider() error {
-	// Hub provider is an experimental feature. Require the experimental flag to be enabled before continuing.
-	if c.Experimental == nil || !c.Experimental.Hub {
-		return errors.New("experimental flag for Hub not set")
-	}
-
-	if c.Hub.TLS == nil {
-		return errors.New("no TLS configuration defined for Hub")
-	}
-
-	if c.Hub.TLS.Insecure && (c.Hub.TLS.CA != "" || c.Hub.TLS.Cert != "" || c.Hub.TLS.Key != "") {
-		return errors.New("mTLS configuration for Hub and insecure TLS for Hub are mutually exclusive")
-	}
-
-	if !c.Hub.TLS.Insecure && (c.Hub.TLS.CA == "" || c.Hub.TLS.Cert == "" || c.Hub.TLS.Key == "") {
-		return errors.New("incomplete mTLS configuration for Hub")
-	}
-
-	if c.Hub.TLS.Insecure {
-		log.WithoutContext().Warn("Hub is in `insecure` mode. Do not run in production with this setup.")
-	}
-
-	// Creates the internal Hub entry point if needed.
-	if c.Hub.EntryPoint == hub.DefaultEntryPointName {
-		if _, ok := c.EntryPoints[hub.DefaultEntryPointName]; !ok {
-			var ep EntryPoint
-			ep.SetDefaults()
-			ep.Address = ":9900"
-			c.EntryPoints[hub.DefaultEntryPointName] = &ep
-			log.WithoutContext().Infof("The entryPoint %q is created on port 9900 to allow Traefik to communicate with the Hub Agent for Traefik.", hub.DefaultEntryPointName)
-		}
-	}
-
-	c.EntryPoints[c.Hub.EntryPoint].HTTP.TLS = &TLSConfig{
-		Options: "traefik-hub",
-	}
-
-	return nil
-}
-
 // ValidateConfiguration validate that configuration is coherent.
 func (c *Configuration) ValidateConfiguration() error {
 	var acmeEmail string

pkg/config/static/static_config_test.go

@@ -0,0 +1,88 @@
+package static
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/traefik/traefik/v2/pkg/provider/hub"
+)
+
+func TestHasEntrypoint(t *testing.T) {
+	tests := []struct {
+		desc        string
+		entryPoints map[string]*EntryPoint
+		assert      assert.BoolAssertionFunc
+	}{
+		{
+			desc:   "no user defined entryPoints",
+			assert: assert.False,
+		},
+		{
+			desc: "user defined entryPoints",
+			entryPoints: map[string]*EntryPoint{
+				"foo": {},
+			},
+			assert: assert.True,
+		},
+		{
+			desc: "user defined entryPoints + hub entryPoint (tunnel)",
+			entryPoints: map[string]*EntryPoint{
+				"foo":                {},
+				hub.TunnelEntrypoint: {},
+			},
+			assert: assert.True,
+		},
+		{
+			desc: "hub entryPoint (tunnel)",
+			entryPoints: map[string]*EntryPoint{
+				hub.TunnelEntrypoint: {},
+			},
+			assert: assert.False,
+		},
+		{
+			desc: "user defined entryPoints + hub entryPoint (api)",
+			entryPoints: map[string]*EntryPoint{
+				"foo":             {},
+				hub.APIEntrypoint: {},
+			},
+			assert: assert.True,
+		},
+		{
+			desc: "hub entryPoint (api)",
+			entryPoints: map[string]*EntryPoint{
+				hub.APIEntrypoint: {},
+			},
+			assert: assert.True,
+		},
+		{
+			desc: "user defined entryPoints + hub entryPoints (tunnel, api)",
+			entryPoints: map[string]*EntryPoint{
+				"foo":                {},
+				hub.TunnelEntrypoint: {},
+				hub.APIEntrypoint:    {},
+			},
+			assert: assert.True,
+		},
+		{
+			desc: "hub entryPoints (tunnel, api)",
+			entryPoints: map[string]*EntryPoint{
+				hub.TunnelEntrypoint: {},
+				hub.APIEntrypoint:    {},
+			},
+			assert: assert.False,
+		},
+	}
+
+	for _, test := range tests {
+		test := test
+		t.Run(test.desc, func(t *testing.T) {
+			t.Parallel()
+
+			cfg := &Configuration{
+				EntryPoints: test.entryPoints,
+			}
+
+			test.assert(t, cfg.hasUserDefinedEntrypoint())
+		})
+	}
+}