Use vanilla Traefik image for mesh proxies

cmd/configuration.go

@@ -5,7 +5,6 @@ import (
 	"time"
 
 	"github.com/containous/traefik/v2/pkg/config/static"
-	"github.com/containous/traefik/v2/pkg/types"
 )
 
 // MaeshConfiguration wraps the static configuration and extra parameters.
@@ -84,26 +83,6 @@ type ProxyConfiguration struct {
 	PollTimeout          time.Duration `description:"Polling timeout for endpoint." json:"pollTimeout,omitempty" toml:"pollTimeout,omitempty" yaml:"pollTimeout,omitempty"`
 }
 
-// NewProxyConfiguration creates a ProxyConfiguration with default values.
-func NewProxyConfiguration() *ProxyConfiguration {
-	return &ProxyConfiguration{
-		PollInterval: 1 * time.Second,
-		PollTimeout:  1 * time.Second,
-		Configuration: static.Configuration{
-			Global: &static.Global{
-				CheckNewVersion: false,
-			},
-			EntryPoints: make(static.EntryPoints),
-			Providers: &static.Providers{
-				ProvidersThrottleDuration: types.Duration(2 * time.Second),
-			},
-			ServersTransport: &static.ServersTransport{
-				MaxIdleConnsPerHost: 200,
-			},
-		},
-	}
-}
-
 // CleanupConfiguration holds the configuration for the cleanup command.
 type CleanupConfiguration struct {
 	ConfigFile string `description:"Configuration file to use. If specified all other flags are ignored." export:"true"`

cmd/maesh/maesh.go

@@ -12,7 +12,6 @@ import (
 	"github.com/containous/maesh/cmd"
 	"github.com/containous/maesh/cmd/cleanup"
 	"github.com/containous/maesh/cmd/prepare"
-	"github.com/containous/maesh/cmd/proxy"
 	"github.com/containous/maesh/cmd/version"
 	"github.com/containous/maesh/pkg/api"
 	"github.com/containous/maesh/pkg/controller"
@@ -54,12 +53,6 @@ func main() {
 		os.Exit(1)
 	}
 
-	traefikLoaders := []cli.ResourceLoader{&cli.FileLoader{}, &cli.FlagLoader{}, &cli.EnvLoader{}}
-	if err := cmdMaesh.AddCommand(proxy.NewCmd(traefikLoaders)); err != nil {
-		stdlog.Println(err)
-		os.Exit(1)
-	}
-
 	if err := cmdMaesh.AddCommand(version.NewCmd()); err != nil {
 		stdlog.Println(err)
 		os.Exit(1)

docs/content/configuration.md

@@ -5,9 +5,9 @@ The static configuration is configured when the service mesh is installed and is
 
 ## Static configuration
 
-- The Maesh image version can be manually defined if needed.
+- The controller image version as well as the Traefik image version used by mesh proxies can be manually defined if needed.
 
-- Logging level and format for controller and proxies can be defined.
+- Logging level and format for the controller and proxies can be defined.
 
 - The default mesh mode can be configured. If this is not set, the default mode will be HTTP.
   This means that new mesh services that are not specified will default to operate in HTTP mode.

docs/content/install.md

@@ -33,7 +33,7 @@ You will then be able to use the tagged image as your image in your `values.yaml
 To deploy the Helm Chart, run:
 
 ```shell
-helm install maesh helm/chart/maesh --set image.pullPolicy=IfNotPresent --set image.tag=latest
+helm install maesh helm/chart/maesh --set controller.image.pullPolicy=IfNotPresent --set controller.image.tag=latest
 ```
 
 ## KubeDNS support