baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Move docker provider to its own package 👼

Browse source 
Makes it simpler to manage :)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
This commit is contained in:
Vincent Demeester 2017-04-15 15:49:53 +02:00
parent dc01094863
commit 3f293ee25b
17 changed files with 163 additions and 161 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
configuration.go
View file

@ -12,6 +12,7 @@ import (
"github.com/containous/flaeg" "github.com/containous/flaeg"
"github.com/containous/traefik/acme" "github.com/containous/traefik/acme"
"github.com/containous/traefik/provider" "github.com/containous/traefik/provider"
"github.com/containous/traefik/provider/docker"
"github.com/containous/traefik/types" "github.com/containous/traefik/types"
) )
@ -40,7 +41,7 @@ type GlobalConfiguration struct {
IdleTimeout flaeg.Duration `description:"maximum amount of time an idle (keep-alive) connection will remain idle before closing itself."` IdleTimeout flaeg.Duration `description:"maximum amount of time an idle (keep-alive) connection will remain idle before closing itself."`
InsecureSkipVerify bool `description:"Disable SSL certificate verification"` InsecureSkipVerify bool `description:"Disable SSL certificate verification"`
Retry *Retry `description:"Enable retry sending request if network error"` Retry *Retry `description:"Enable retry sending request if network error"`
Docker *provider.Docker `description:"Enable Docker backend"` Docker *docker.Provider `description:"Enable Docker backend"`
File *provider.File `description:"Enable File backend"` File *provider.File `description:"Enable File backend"`
Web *WebProvider `description:"Enable Web backend"` Web *WebProvider `description:"Enable Web backend"`
Marathon *provider.Marathon `description:"Enable Marathon backend"` Marathon *provider.Marathon `description:"Enable Marathon backend"`
@ -328,7 +329,7 @@ type Retry struct {
// NewTraefikDefaultPointersConfiguration creates a TraefikConfiguration with pointers default values // NewTraefikDefaultPointersConfiguration creates a TraefikConfiguration with pointers default values
func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration { func NewTraefikDefaultPointersConfiguration() *TraefikConfiguration {
//default Docker //default Docker
var defaultDocker provider.Docker var defaultDocker docker.Provider
defaultDocker.Watch = true defaultDocker.Watch = true
defaultDocker.ExposedByDefault = true defaultDocker.ExposedByDefault = true
defaultDocker.Endpoint = "unix:///var/run/docker.sock" defaultDocker.Endpoint = "unix:///var/run/docker.sock"

4
provider/consul_catalog.go
View file

@ -176,7 +176,7 @@ func (provider *ConsulCatalog) getBackendName(node *api.ServiceEntry, index int)
serviceName := strings.ToLower(node.Service.Service) + "--" + node.Service.Address + "--" + strconv.Itoa(node.Service.Port) serviceName := strings.ToLower(node.Service.Service) + "--" + node.Service.Address + "--" + strconv.Itoa(node.Service.Port)
for _, tag := range node.Service.Tags { for _, tag := range node.Service.Tags {
serviceName += "--" + normalize(tag) serviceName += "--" + Normalize(tag)
} }
serviceName = strings.Replace(serviceName, ".", "-", -1) serviceName = strings.Replace(serviceName, ".", "-", -1)
@ -246,7 +246,7 @@ func (provider *ConsulCatalog) buildConfig(catalog []catalogUpdate) *types.Confi
Nodes: allNodes, Nodes: allNodes,
} }
configuration, err := provider.getConfiguration("templates/consul_catalog.tmpl", FuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/consul_catalog.tmpl", FuncMap, templateObjects)
if err != nil { if err != nil {
log.WithError(err).Error("Failed to create config") log.WithError(err).Error("Failed to create config")
} }

251
provider/docker.go → provider/docker/docker.go
View file

@ -1,4 +1,4 @@
package provider package docker
import ( import (
"context" "context"
@ -6,6 +6,7 @@ import (
"math" "math"
"net" "net"
"net/http" "net/http"
"regexp"
"strconv" "strconv"
"strings" "strings"
"text/template" "text/template"
@ -15,6 +16,7 @@ import (
"github.com/cenk/backoff" "github.com/cenk/backoff"
"github.com/containous/traefik/job" "github.com/containous/traefik/job"
"github.com/containous/traefik/log" "github.com/containous/traefik/log"
"github.com/containous/traefik/provider"
"github.com/containous/traefik/safe" "github.com/containous/traefik/safe"
"github.com/containous/traefik/types" "github.com/containous/traefik/types"
"github.com/containous/traefik/version" "github.com/containous/traefik/version"
@ -28,30 +30,29 @@ import (
"github.com/docker/go-connections/nat" "github.com/docker/go-connections/nat"
"github.com/docker/go-connections/sockets" "github.com/docker/go-connections/sockets"
"github.com/vdemeester/docker-events" "github.com/vdemeester/docker-events"
"regexp"
) )
const ( const (
// SwarmAPIVersion is a constant holding the version of the Docker API traefik will use // SwarmAPIVersion is a constant holding the version of the Provider API traefik will use
SwarmAPIVersion string = "1.24" SwarmAPIVersion string = "1.24"
// SwarmDefaultWatchTime is the duration of the interval when polling docker // SwarmDefaultWatchTime is the duration of the interval when polling docker
SwarmDefaultWatchTime = 15 * time.Second SwarmDefaultWatchTime = 15 * time.Second
) )
var _ Provider = (*Docker)(nil) var _ provider.Provider = (*Provider)(nil)
// Docker holds configurations of the Docker provider. // Provider holds configurations of the Provider p.
type Docker struct { type Provider struct {
BaseProvider `mapstructure:",squash"` provider.BaseProvider `mapstructure:",squash"`
Endpoint string `description:"Docker server endpoint. Can be a tcp or a unix socket endpoint"` Endpoint string `description:"Provider server endpoint. Can be a tcp or a unix socket endpoint"`
Domain string `description:"Default domain used"` Domain string `description:"Default domain used"`
TLS *ClientTLS `description:"Enable Docker TLS support"` TLS *provider.ClientTLS `description:"Enable Provider TLS support"`
ExposedByDefault bool `description:"Expose containers by default"` ExposedByDefault bool `description:"Expose containers by default"`
UseBindPortIP bool `description:"Use the ip address from the bound port, rather than from the inner network"` UseBindPortIP bool `description:"Use the ip address from the bound port, rather than from the inner network"`
SwarmMode bool `description:"Use Docker on Swarm Mode"` SwarmMode bool `description:"Use Provider on Swarm Mode"`
} }
// dockerData holds the need data to the Docker provider // dockerData holds the need data to the Provider p
type dockerData struct { type dockerData struct {
ServiceName string ServiceName string
Name string Name string
@ -60,14 +61,14 @@ type dockerData struct {
Health string Health string
} }
// NetworkSettings holds the networks data to the Docker provider // NetworkSettings holds the networks data to the Provider p
type networkSettings struct { type networkSettings struct {
NetworkMode dockercontainertypes.NetworkMode NetworkMode dockercontainertypes.NetworkMode
Ports nat.PortMap Ports nat.PortMap
Networks map[string]*networkData Networks map[string]*networkData
} }
// Network holds the network data to the Docker provider // Network holds the network data to the Provider p
type networkData struct { type networkData struct {
Name string Name string
Addr string Addr string
@ -76,20 +77,20 @@ type networkData struct {
ID string ID string
} }
func (provider *Docker) createClient() (client.APIClient, error) { func (p *Provider) createClient() (client.APIClient, error) {
var httpClient *http.Client var httpClient *http.Client
httpHeaders := map[string]string{ httpHeaders := map[string]string{
"User-Agent": "Traefik " + version.Version, "User-Agent": "Traefik " + version.Version,
} }
if provider.TLS != nil { if p.TLS != nil {
config, err := provider.TLS.CreateTLSConfig() config, err := p.TLS.CreateTLSConfig()
if err != nil { if err != nil {
return nil, err return nil, err
} }
tr := &http.Transport{ tr := &http.Transport{
TLSClientConfig: config, TLSClientConfig: config,
} }
proto, addr, _, err := client.ParseHost(provider.Endpoint) proto, addr, _, err := client.ParseHost(p.Endpoint)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -102,25 +103,25 @@ func (provider *Docker) createClient() (client.APIClient, error) {
} }
var version string var version string
if provider.SwarmMode { if p.SwarmMode {
version = SwarmAPIVersion version = SwarmAPIVersion
} else { } else {
version = DockerAPIVersion version = DockerAPIVersion
} }
return client.NewClient(provider.Endpoint, version, httpClient, httpHeaders) return client.NewClient(p.Endpoint, version, httpClient, httpHeaders)
} }
// Provide allows the provider to provide configurations to traefik // Provide allows the p to provide configurations to traefik
// using the given configuration channel. // using the given configuration channel.
func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error { func (p *Provider) Provide(configurationChan chan<- types.ConfigMessage, pool *safe.Pool, constraints types.Constraints) error {
provider.Constraints = append(provider.Constraints, constraints...) p.Constraints = append(p.Constraints, constraints...)
// TODO register this routine in pool, and watch for stop channel // TODO register this routine in pool, and watch for stop channel
safe.Go(func() { safe.Go(func() {
operation := func() error { operation := func() error {
var err error var err error
dockerClient, err := provider.createClient() dockerClient, err := p.createClient()
if err != nil { if err != nil {
log.Errorf("Failed to create a client for docker, error: %s", err) log.Errorf("Failed to create a client for docker, error: %s", err)
return err return err
@ -128,10 +129,10 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
ctx := context.Background() ctx := context.Background()
version, err := dockerClient.ServerVersion(ctx) version, err := dockerClient.ServerVersion(ctx)
log.Debugf("Docker connection established with docker %s (API %s)", version.Version, version.APIVersion) log.Debugf("Provider connection established with docker %s (API %s)", version.Version, version.APIVersion)
var dockerDataList []dockerData var dockerDataList []dockerData
if provider.SwarmMode { if p.SwarmMode {
dockerDataList, err = provider.listServices(ctx, dockerClient) dockerDataList, err = p.listServices(ctx, dockerClient)
if err != nil { if err != nil {
log.Errorf("Failed to list services for docker swarm mode, error %s", err) log.Errorf("Failed to list services for docker swarm mode, error %s", err)
return err return err
@ -144,26 +145,26 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
} }
} }
configuration := provider.loadDockerConfig(dockerDataList) configuration := p.loadDockerConfig(dockerDataList)
configurationChan <- types.ConfigMessage{ configurationChan <- types.ConfigMessage{
ProviderName: "docker", ProviderName: "docker",
Configuration: configuration, Configuration: configuration,
} }
if provider.Watch { if p.Watch {
ctx, cancel := context.WithCancel(ctx) ctx, cancel := context.WithCancel(ctx)
if provider.SwarmMode { if p.SwarmMode {
// TODO: This need to be change. Linked to Swarm events docker/docker#23827 // TODO: This need to be change. Linked to Swarm events docker/docker#23827
ticker := time.NewTicker(SwarmDefaultWatchTime) ticker := time.NewTicker(SwarmDefaultWatchTime)
pool.Go(func(stop chan bool) { pool.Go(func(stop chan bool) {
for { for {
select { select {
case <-ticker.C: case <-ticker.C:
services, err := provider.listServices(ctx, dockerClient) services, err := p.listServices(ctx, dockerClient)
if err != nil { if err != nil {
log.Errorf("Failed to list services for docker, error %s", err) log.Errorf("Failed to list services for docker, error %s", err)
return return
} }
configuration := provider.loadDockerConfig(services) configuration := p.loadDockerConfig(services)
if configuration != nil { if configuration != nil {
configurationChan <- types.ConfigMessage{ configurationChan <- types.ConfigMessage{
ProviderName: "docker", ProviderName: "docker",
@ -196,7 +197,7 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
} }
eventHandler := events.NewHandler(events.ByAction) eventHandler := events.NewHandler(events.ByAction)
startStopHandle := func(m eventtypes.Message) { startStopHandle := func(m eventtypes.Message) {
log.Debugf("Docker event received %+v", m) log.Debugf("Provider event received %+v", m)
containers, err := listContainers(ctx, dockerClient) containers, err := listContainers(ctx, dockerClient)
if err != nil { if err != nil {
log.Errorf("Failed to list containers for docker, error %s", err) log.Errorf("Failed to list containers for docker, error %s", err)
@ -204,7 +205,7 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
cancel() cancel()
return return
} }
configuration := provider.loadDockerConfig(containers) configuration := p.loadDockerConfig(containers)
if configuration != nil { if configuration != nil {
configurationChan <- types.ConfigMessage{ configurationChan <- types.ConfigMessage{
ProviderName: "docker", ProviderName: "docker",
@ -227,7 +228,7 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
return nil return nil
} }
notify := func(err error, time time.Duration) { notify := func(err error, time time.Duration) {
log.Errorf("Docker connection error %+v, retrying in %s", err, time) log.Errorf("Provider connection error %+v, retrying in %s", err, time)
} }
err := backoff.RetryNotify(safe.OperationWithRecover(operation), job.NewBackOff(backoff.NewExponentialBackOff()), notify) err := backoff.RetryNotify(safe.OperationWithRecover(operation), job.NewBackOff(backoff.NewExponentialBackOff()), notify)
if err != nil { if err != nil {
@ -238,50 +239,50 @@ func (provider *Docker) Provide(configurationChan chan<- types.ConfigMessage, po
return nil return nil
} }
func (provider *Docker) loadDockerConfig(containersInspected []dockerData) *types.Configuration { func (p *Provider) loadDockerConfig(containersInspected []dockerData) *types.Configuration {
var DockerFuncMap = template.FuncMap{ var DockerFuncMap = template.FuncMap{
"getBackend": provider.getBackend, "getBackend": p.getBackend,
"getIPAddress": provider.getIPAddress, "getIPAddress": p.getIPAddress,
"getPort": provider.getPort, "getPort": p.getPort,
"getWeight": provider.getWeight, "getWeight": p.getWeight,
"getDomain": provider.getDomain, "getDomain": p.getDomain,
"getProtocol": provider.getProtocol, "getProtocol": p.getProtocol,
"getPassHostHeader": provider.getPassHostHeader, "getPassHostHeader": p.getPassHostHeader,
"getPriority": provider.getPriority, "getPriority": p.getPriority,
"getEntryPoints": provider.getEntryPoints, "getEntryPoints": p.getEntryPoints,
"getFrontendRule": provider.getFrontendRule, "getFrontendRule": p.getFrontendRule,
"hasCircuitBreakerLabel": provider.hasCircuitBreakerLabel, "hasCircuitBreakerLabel": p.hasCircuitBreakerLabel,
"getCircuitBreakerExpression": provider.getCircuitBreakerExpression, "getCircuitBreakerExpression": p.getCircuitBreakerExpression,
"hasLoadBalancerLabel": provider.hasLoadBalancerLabel, "hasLoadBalancerLabel": p.hasLoadBalancerLabel,
"getLoadBalancerMethod": provider.getLoadBalancerMethod, "getLoadBalancerMethod": p.getLoadBalancerMethod,
"hasMaxConnLabels": provider.hasMaxConnLabels, "hasMaxConnLabels": p.hasMaxConnLabels,
"getMaxConnAmount": provider.getMaxConnAmount, "getMaxConnAmount": p.getMaxConnAmount,
"getMaxConnExtractorFunc": provider.getMaxConnExtractorFunc, "getMaxConnExtractorFunc": p.getMaxConnExtractorFunc,
"getSticky": provider.getSticky, "getSticky": p.getSticky,
"getIsBackendLBSwarm": provider.getIsBackendLBSwarm, "getIsBackendLBSwarm": p.getIsBackendLBSwarm,
"hasServices": provider.hasServices, "hasServices": p.hasServices,
"getServiceNames": provider.getServiceNames, "getServiceNames": p.getServiceNames,
"getServicePort": provider.getServicePort, "getServicePort": p.getServicePort,
"getServiceWeight": provider.getServiceWeight, "getServiceWeight": p.getServiceWeight,
"getServiceProtocol": provider.getServiceProtocol, "getServiceProtocol": p.getServiceProtocol,
"getServiceEntryPoints": provider.getServiceEntryPoints, "getServiceEntryPoints": p.getServiceEntryPoints,
"getServiceFrontendRule": provider.getServiceFrontendRule, "getServiceFrontendRule": p.getServiceFrontendRule,
"getServicePassHostHeader": provider.getServicePassHostHeader, "getServicePassHostHeader": p.getServicePassHostHeader,
"getServicePriority": provider.getServicePriority, "getServicePriority": p.getServicePriority,
"getServiceBackend": provider.getServiceBackend, "getServiceBackend": p.getServiceBackend,
} }
// filter containers // filter containers
filteredContainers := fun.Filter(func(container dockerData) bool { filteredContainers := fun.Filter(func(container dockerData) bool {
return provider.containerFilter(container) return p.containerFilter(container)
}, containersInspected).([]dockerData) }, containersInspected).([]dockerData)
frontends := map[string][]dockerData{} frontends := map[string][]dockerData{}
backends := map[string]dockerData{} backends := map[string]dockerData{}
servers := map[string][]dockerData{} servers := map[string][]dockerData{}
for _, container := range filteredContainers { for _, container := range filteredContainers {
frontendName := provider.getFrontendName(container) frontendName := p.getFrontendName(container)
frontends[frontendName] = append(frontends[frontendName], container) frontends[frontendName] = append(frontends[frontendName], container)
backendName := provider.getBackend(container) backendName := p.getBackend(container)
backends[backendName] = container backends[backendName] = container
servers[backendName] = append(servers[backendName], container) servers[backendName] = append(servers[backendName], container)
} }
@ -297,17 +298,17 @@ func (provider *Docker) loadDockerConfig(containersInspected []dockerData) *type
frontends, frontends,
backends, backends,
servers, servers,
provider.Domain, p.Domain,
} }
configuration, err := provider.getConfiguration("templates/docker.tmpl", DockerFuncMap, templateObjects) configuration, err := p.GetConfiguration("templates/docker.tmpl", DockerFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }
return configuration return configuration
} }
func (provider *Docker) hasCircuitBreakerLabel(container dockerData) bool { func (p *Provider) hasCircuitBreakerLabel(container dockerData) bool {
if _, err := getLabel(container, "traefik.backend.circuitbreaker.expression"); err != nil { if _, err := getLabel(container, "traefik.backend.circuitbreaker.expression"); err != nil {
return false return false
} }
@ -323,7 +324,7 @@ var servicesPropertiesRegexp = regexp.MustCompile(`^traefik\.(?P<service_name>.*
type labelServiceProperties map[string]map[string]string type labelServiceProperties map[string]map[string]string
// Check if for the given container, we find labels that are defining services // Check if for the given container, we find labels that are defining services
func (provider *Docker) hasServices(container dockerData) bool { func (p *Provider) hasServices(container dockerData) bool {
return len(extractServicesLabels(container.Labels)) > 0 return len(extractServicesLabels(container.Labels)) > 0
} }
@ -358,7 +359,7 @@ func getContainerServiceLabel(container dockerData, serviceName string, entry st
} }
// Gets array of service names for a given container // Gets array of service names for a given container
func (provider *Docker) getServiceNames(container dockerData) []string { func (p *Provider) getServiceNames(container dockerData) []string {
labelServiceProperties := extractServicesLabels(container.Labels) labelServiceProperties := extractServicesLabels(container.Labels)
keys := make([]string, 0, len(labelServiceProperties)) keys := make([]string, 0, len(labelServiceProperties))
for k := range labelServiceProperties { for k := range labelServiceProperties {
@ -368,73 +369,73 @@ func (provider *Docker) getServiceNames(container dockerData) []string {
} }
// Extract entrypoints from labels for a given service and a given docker container // Extract entrypoints from labels for a given service and a given docker container
func (provider *Docker) getServiceEntryPoints(container dockerData, serviceName string) []string { func (p *Provider) getServiceEntryPoints(container dockerData, serviceName string) []string {
if entryPoints, ok := getContainerServiceLabel(container, serviceName, "frontend.entryPoints"); ok { if entryPoints, ok := getContainerServiceLabel(container, serviceName, "frontend.entryPoints"); ok {
return strings.Split(entryPoints, ",") return strings.Split(entryPoints, ",")
} }
return provider.getEntryPoints(container) return p.getEntryPoints(container)
} }
// Extract passHostHeader from labels for a given service and a given docker container // Extract passHostHeader from labels for a given service and a given docker container
func (provider *Docker) getServicePassHostHeader(container dockerData, serviceName string) string { func (p *Provider) getServicePassHostHeader(container dockerData, serviceName string) string {
if servicePassHostHeader, ok := getContainerServiceLabel(container, serviceName, "frontend.passHostHeader"); ok { if servicePassHostHeader, ok := getContainerServiceLabel(container, serviceName, "frontend.passHostHeader"); ok {
return servicePassHostHeader return servicePassHostHeader
} }
return provider.getPassHostHeader(container) return p.getPassHostHeader(container)
} }
// Extract priority from labels for a given service and a given docker container // Extract priority from labels for a given service and a given docker container
func (provider *Docker) getServicePriority(container dockerData, serviceName string) string { func (p *Provider) getServicePriority(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "frontend.priority"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "frontend.priority"); ok {
return value return value
} }
return provider.getPriority(container) return p.getPriority(container)
} }
// Extract backend from labels for a given service and a given docker container // Extract backend from labels for a given service and a given docker container
func (provider *Docker) getServiceBackend(container dockerData, serviceName string) string { func (p *Provider) getServiceBackend(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "frontend.backend"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "frontend.backend"); ok {
return value return value
} }
return provider.getBackend(container) + "-" + normalize(serviceName) return p.getBackend(container) + "-" + provider.Normalize(serviceName)
} }
// Extract rule from labels for a given service and a given docker container // Extract rule from labels for a given service and a given docker container
func (provider *Docker) getServiceFrontendRule(container dockerData, serviceName string) string { func (p *Provider) getServiceFrontendRule(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "frontend.rule"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "frontend.rule"); ok {
return value return value
} }
return provider.getFrontendRule(container) return p.getFrontendRule(container)
} }
// Extract port from labels for a given service and a given docker container // Extract port from labels for a given service and a given docker container
func (provider *Docker) getServicePort(container dockerData, serviceName string) string { func (p *Provider) getServicePort(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "port"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "port"); ok {
return value return value
} }
return provider.getPort(container) return p.getPort(container)
} }
// Extract weight from labels for a given service and a given docker container // Extract weight from labels for a given service and a given docker container
func (provider *Docker) getServiceWeight(container dockerData, serviceName string) string { func (p *Provider) getServiceWeight(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "weight"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "weight"); ok {
return value return value
} }
return provider.getWeight(container) return p.getWeight(container)
} }
// Extract protocol from labels for a given service and a given docker container // Extract protocol from labels for a given service and a given docker container
func (provider *Docker) getServiceProtocol(container dockerData, serviceName string) string { func (p *Provider) getServiceProtocol(container dockerData, serviceName string) string {
if value, ok := getContainerServiceLabel(container, serviceName, "protocol"); ok { if value, ok := getContainerServiceLabel(container, serviceName, "protocol"); ok {
return value return value
} }
return provider.getProtocol(container) return p.getProtocol(container)
} }
func (provider *Docker) hasLoadBalancerLabel(container dockerData) bool { func (p *Provider) hasLoadBalancerLabel(container dockerData) bool {
_, errMethod := getLabel(container, "traefik.backend.loadbalancer.method") _, errMethod := getLabel(container, "traefik.backend.loadbalancer.method")
_, errSticky := getLabel(container, "traefik.backend.loadbalancer.sticky") _, errSticky := getLabel(container, "traefik.backend.loadbalancer.sticky")
if errMethod != nil && errSticky != nil { if errMethod != nil && errSticky != nil {
@ -443,7 +444,7 @@ func (provider *Docker) hasLoadBalancerLabel(container dockerData) bool {
return true return true
} }
func (provider *Docker) hasMaxConnLabels(container dockerData) bool { func (p *Provider) hasMaxConnLabels(container dockerData) bool {
if _, err := getLabel(container, "traefik.backend.maxconn.amount"); err != nil { if _, err := getLabel(container, "traefik.backend.maxconn.amount"); err != nil {
return false return false
} }
@ -453,21 +454,21 @@ func (provider *Docker) hasMaxConnLabels(container dockerData) bool {
return true return true
} }
func (provider *Docker) getCircuitBreakerExpression(container dockerData) string { func (p *Provider) getCircuitBreakerExpression(container dockerData) string {
if label, err := getLabel(container, "traefik.backend.circuitbreaker.expression"); err == nil { if label, err := getLabel(container, "traefik.backend.circuitbreaker.expression"); err == nil {
return label return label
} }
return "NetworkErrorRatio() > 1" return "NetworkErrorRatio() > 1"
} }
func (provider *Docker) getLoadBalancerMethod(container dockerData) string { func (p *Provider) getLoadBalancerMethod(container dockerData) string {
if label, err := getLabel(container, "traefik.backend.loadbalancer.method"); err == nil { if label, err := getLabel(container, "traefik.backend.loadbalancer.method"); err == nil {
return label return label
} }
return "wrr" return "wrr"
} }
func (provider *Docker) getMaxConnAmount(container dockerData) int64 { func (p *Provider) getMaxConnAmount(container dockerData) int64 {
if label, err := getLabel(container, "traefik.backend.maxconn.amount"); err == nil { if label, err := getLabel(container, "traefik.backend.maxconn.amount"); err == nil {
i, errConv := strconv.ParseInt(label, 10, 64) i, errConv := strconv.ParseInt(label, 10, 64)
if errConv != nil { if errConv != nil {
@ -479,27 +480,27 @@ func (provider *Docker) getMaxConnAmount(container dockerData) int64 {
return math.MaxInt64 return math.MaxInt64
} }
func (provider *Docker) getMaxConnExtractorFunc(container dockerData) string { func (p *Provider) getMaxConnExtractorFunc(container dockerData) string {
if label, err := getLabel(container, "traefik.backend.maxconn.extractorfunc"); err == nil { if label, err := getLabel(container, "traefik.backend.maxconn.extractorfunc"); err == nil {
return label return label
} }
return "request.host" return "request.host"
} }
func (provider *Docker) containerFilter(container dockerData) bool { func (p *Provider) containerFilter(container dockerData) bool {
_, err := strconv.Atoi(container.Labels["traefik.port"]) _, err := strconv.Atoi(container.Labels["traefik.port"])
if len(container.NetworkSettings.Ports) == 0 && err != nil { if len(container.NetworkSettings.Ports) == 0 && err != nil {
log.Debugf("Filtering container without port and no traefik.port label %s", container.Name) log.Debugf("Filtering container without port and no traefik.port label %s", container.Name)
return false return false
} }
if !isContainerEnabled(container, provider.ExposedByDefault) { if !isContainerEnabled(container, p.ExposedByDefault) {
log.Debugf("Filtering disabled container %s", container.Name) log.Debugf("Filtering disabled container %s", container.Name)
return false return false
} }
constraintTags := strings.Split(container.Labels["traefik.tags"], ",") constraintTags := strings.Split(container.Labels["traefik.tags"], ",")
if ok, failingConstraint := provider.MatchConstraints(constraintTags); !ok { if ok, failingConstraint := p.MatchConstraints(constraintTags); !ok {
if failingConstraint != nil { if failingConstraint != nil {
log.Debugf("Container %v pruned by '%v' constraint", container.Name, failingConstraint.String()) log.Debugf("Container %v pruned by '%v' constraint", container.Name, failingConstraint.String())
} }
@ -514,35 +515,35 @@ func (provider *Docker) containerFilter(container dockerData) bool {
return true return true
} }
func (provider *Docker) getFrontendName(container dockerData) string { func (p *Provider) getFrontendName(container dockerData) string {
// Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78 // Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78
return normalize(provider.getFrontendRule(container)) return provider.Normalize(p.getFrontendRule(container))
} }
// GetFrontendRule returns the frontend rule for the specified container, using // GetFrontendRule returns the frontend rule for the specified container, using
// it's label. It returns a default one (Host) if the label is not present. // it's label. It returns a default one (Host) if the label is not present.
func (provider *Docker) getFrontendRule(container dockerData) string { func (p *Provider) getFrontendRule(container dockerData) string {
if label, err := getLabel(container, "traefik.frontend.rule"); err == nil { if label, err := getLabel(container, "traefik.frontend.rule"); err == nil {
return label return label
} }
if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil { if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil {
return "Host:" + provider.getSubDomain(labels["com.docker.compose.service"]+"."+labels["com.docker.compose.project"]) + "." + provider.Domain return "Host:" + p.getSubDomain(labels["com.docker.compose.service"]+"."+labels["com.docker.compose.project"]) + "." + p.Domain
} }
return "Host:" + provider.getSubDomain(container.ServiceName) + "." + provider.Domain return "Host:" + p.getSubDomain(container.ServiceName) + "." + p.Domain
} }
func (provider *Docker) getBackend(container dockerData) string { func (p *Provider) getBackend(container dockerData) string {
if label, err := getLabel(container, "traefik.backend"); err == nil { if label, err := getLabel(container, "traefik.backend"); err == nil {
return normalize(label) return provider.Normalize(label)
} }
if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil { if labels, err := getLabels(container, []string{"com.docker.compose.project", "com.docker.compose.service"}); err == nil {
return normalize(labels["com.docker.compose.service"] + "_" + labels["com.docker.compose.project"]) return provider.Normalize(labels["com.docker.compose.service"] + "_" + labels["com.docker.compose.project"])
} }
return normalize(container.ServiceName) return provider.Normalize(container.ServiceName)
} }
func (provider *Docker) getIPAddress(container dockerData) string { func (p *Provider) getIPAddress(container dockerData) string {
if label, err := getLabel(container, "traefik.docker.network"); err == nil && label != "" { if label, err := getLabel(container, "traefik.docker.network"); err == nil && label != "" {
networkSettings := container.NetworkSettings networkSettings := container.NetworkSettings
if networkSettings.Networks != nil { if networkSettings.Networks != nil {
@ -561,8 +562,8 @@ func (provider *Docker) getIPAddress(container dockerData) string {
return "127.0.0.1" return "127.0.0.1"
} }
if provider.UseBindPortIP { if p.UseBindPortIP {
port := provider.getPort(container) port := p.getPort(container)
for netport, portBindings := range container.NetworkSettings.Ports { for netport, portBindings := range container.NetworkSettings.Ports {
if string(netport) == port+"/TCP" || string(netport) == port+"/UDP" { if string(netport) == port+"/TCP" || string(netport) == port+"/UDP" {
for _, p := range portBindings { for _, p := range portBindings {
@ -578,7 +579,7 @@ func (provider *Docker) getIPAddress(container dockerData) string {
return "" return ""
} }
func (provider *Docker) getPort(container dockerData) string { func (p *Provider) getPort(container dockerData) string {
if label, err := getLabel(container, "traefik.port"); err == nil { if label, err := getLabel(container, "traefik.port"); err == nil {
return label return label
} }
@ -588,56 +589,56 @@ func (provider *Docker) getPort(container dockerData) string {
return "" return ""
} }
func (provider *Docker) getWeight(container dockerData) string { func (p *Provider) getWeight(container dockerData) string {
if label, err := getLabel(container, "traefik.weight"); err == nil { if label, err := getLabel(container, "traefik.weight"); err == nil {
return label return label
} }
return "0" return "0"
} }
func (provider *Docker) getSticky(container dockerData) string { func (p *Provider) getSticky(container dockerData) string {
if label, err := getLabel(container, "traefik.backend.loadbalancer.sticky"); err == nil { if label, err := getLabel(container, "traefik.backend.loadbalancer.sticky"); err == nil {
return label return label
} }
return "false" return "false"
} }
func (provider *Docker) getIsBackendLBSwarm(container dockerData) string { func (p *Provider) getIsBackendLBSwarm(container dockerData) string {
if label, err := getLabel(container, "traefik.backend.loadbalancer.swarm"); err == nil { if label, err := getLabel(container, "traefik.backend.loadbalancer.swarm"); err == nil {
return label return label
} }
return "false" return "false"
} }
func (provider *Docker) getDomain(container dockerData) string { func (p *Provider) getDomain(container dockerData) string {
if label, err := getLabel(container, "traefik.domain"); err == nil { if label, err := getLabel(container, "traefik.domain"); err == nil {
return label return label
} }
return provider.Domain return p.Domain
} }
func (provider *Docker) getProtocol(container dockerData) string { func (p *Provider) getProtocol(container dockerData) string {
if label, err := getLabel(container, "traefik.protocol"); err == nil { if label, err := getLabel(container, "traefik.protocol"); err == nil {
return label return label
} }
return "http" return "http"
} }
func (provider *Docker) getPassHostHeader(container dockerData) string { func (p *Provider) getPassHostHeader(container dockerData) string {
if passHostHeader, err := getLabel(container, "traefik.frontend.passHostHeader"); err == nil { if passHostHeader, err := getLabel(container, "traefik.frontend.passHostHeader"); err == nil {
return passHostHeader return passHostHeader
} }
return "true" return "true"
} }
func (provider *Docker) getPriority(container dockerData) string { func (p *Provider) getPriority(container dockerData) string {
if priority, err := getLabel(container, "traefik.frontend.priority"); err == nil { if priority, err := getLabel(container, "traefik.frontend.priority"); err == nil {
return priority return priority
} }
return "0" return "0"
} }
func (provider *Docker) getEntryPoints(container dockerData) []string { func (p *Provider) getEntryPoints(container dockerData) []string {
if entryPoints, err := getLabel(container, "traefik.frontend.entryPoints"); err == nil { if entryPoints, err := getLabel(container, "traefik.frontend.entryPoints"); err == nil {
return strings.Split(entryPoints, ",") return strings.Split(entryPoints, ",")
} }
@ -736,11 +737,11 @@ func parseContainer(container dockertypes.ContainerJSON) dockerData {
} }
// Escape beginning slash "/", convert all others to dash "-", and convert underscores "_" to dash "-" // Escape beginning slash "/", convert all others to dash "-", and convert underscores "_" to dash "-"
func (provider *Docker) getSubDomain(name string) string { func (p *Provider) getSubDomain(name string) string {
return strings.Replace(strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1), "_", "-", -1) return strings.Replace(strings.Replace(strings.TrimPrefix(name, "/"), "/", "-", -1), "_", "-", -1)
} }
func (provider *Docker) listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerData, error) { func (p *Provider) listServices(ctx context.Context, dockerClient client.APIClient) ([]dockerData, error) {
serviceList, err := dockerClient.ServiceList(ctx, dockertypes.ServiceListOptions{}) serviceList, err := dockerClient.ServiceList(ctx, dockertypes.ServiceListOptions{})
if err != nil { if err != nil {
return []dockerData{}, err return []dockerData{}, err
@ -765,7 +766,7 @@ func (provider *Docker) listServices(ctx context.Context, dockerClient client.AP
for _, service := range serviceList { for _, service := range serviceList {
dockerData := parseService(service, networkMap) dockerData := parseService(service, networkMap)
useSwarmLB, _ := strconv.ParseBool(provider.getIsBackendLBSwarm(dockerData)) useSwarmLB, _ := strconv.ParseBool(p.getIsBackendLBSwarm(dockerData))
isGlobalSvc := service.Spec.Mode.Global != nil isGlobalSvc := service.Spec.Mode.Global != nil
if useSwarmLB { if useSwarmLB {

0
provider/docker_test.go → provider/docker/docker_test.go
View file

8
provider/docker/docker_unix.go Normal file
View file

@ -0,0 +1,8 @@
// +build !windows
package docker
const (
// DockerAPIVersion is a constant holding the version of the Provider API traefik will use
DockerAPIVersion string = "1.21"
)

6
provider/docker/docker_windows.go Normal file
View file

@ -0,0 +1,6 @@
package docker
const (
// DockerAPIVersion is a constant holding the version of the Provider API traefik will use
DockerAPIVersion string = "1.24"
)

8
provider/docker_unix.go
View file

@ -1,8 +0,0 @@
// +build !windows
package provider
const (
// DockerAPIVersion is a constant holding the version of the Docker API traefik will use
DockerAPIVersion string = "1.21"
)

6
provider/docker_windows.go
View file

@ -1,6 +0,0 @@
package provider
const (
// DockerAPIVersion is a constant holding the version of the Docker API traefik will use
DockerAPIVersion string = "1.24"
)

2
provider/ecs.go
View file

@ -182,7 +182,7 @@ func (provider *ECS) loadECSConfig(ctx context.Context, client *awsClient) (*typ
instances = fun.Filter(provider.filterInstance, instances).([]ecsInstance) instances = fun.Filter(provider.filterInstance, instances).([]ecsInstance)
return provider.getConfiguration("templates/ecs.tmpl", ecsFuncMap, struct { return provider.GetConfiguration("templates/ecs.tmpl", ecsFuncMap, struct {
Instances []ecsInstance Instances []ecsInstance
}{ }{
instances, instances,

2
provider/eureka.go
View file

@ -108,7 +108,7 @@ func (provider *Eureka) buildConfiguration() (*types.Configuration, error) {
applications.Applications, applications.Applications,
} }
configuration, err := provider.getConfiguration("templates/eureka.tmpl", EurekaFuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/eureka.tmpl", EurekaFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }

2
provider/kubernetes.go
View file

@ -320,7 +320,7 @@ func (provider *Kubernetes) getPassHostHeader() bool {
func (provider *Kubernetes) loadConfig(templateObjects types.Configuration) *types.Configuration { func (provider *Kubernetes) loadConfig(templateObjects types.Configuration) *types.Configuration {
var FuncMap = template.FuncMap{} var FuncMap = template.FuncMap{}
configuration, err := provider.getConfiguration("templates/kubernetes.tmpl", FuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/kubernetes.tmpl", FuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }

2
provider/kv.go
View file

@ -130,7 +130,7 @@ func (provider *Kv) loadConfig() *types.Configuration {
"Last": provider.last, "Last": provider.last,
} }
configuration, err := provider.getConfiguration("templates/kv.tmpl", KvFuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/kv.tmpl", KvFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }

2
provider/marathon.go
View file

@ -183,7 +183,7 @@ func (provider *Marathon) loadMarathonConfig() *types.Configuration {
provider.Domain, provider.Domain,
} }
configuration, err := provider.getConfiguration("templates/marathon.tmpl", MarathonFuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/marathon.tmpl", MarathonFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }

2
provider/mesos.go
View file

@ -167,7 +167,7 @@ func (provider *Mesos) loadMesosConfig() *types.Configuration {
provider.Domain, provider.Domain,
} }
configuration, err := provider.getConfiguration("templates/mesos.tmpl", mesosFuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/mesos.tmpl", mesosFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }

6
provider/provider.go
View file

@ -51,7 +51,7 @@ func (p *BaseProvider) MatchConstraints(tags []string) (bool, *types.Constraint)
return true, nil return true, nil
} }
func (p *BaseProvider) getConfiguration(defaultTemplateFile string, funcMap template.FuncMap, templateObjects interface{}) (*types.Configuration, error) { func (p *BaseProvider) GetConfiguration(defaultTemplateFile string, funcMap template.FuncMap, templateObjects interface{}) (*types.Configuration, error) {
var ( var (
buf []byte buf []byte
err error err error
@ -60,7 +60,7 @@ func (p *BaseProvider) getConfiguration(defaultTemplateFile string, funcMap temp
var defaultFuncMap = template.FuncMap{ var defaultFuncMap = template.FuncMap{
"replace": replace, "replace": replace,
"tolower": strings.ToLower, "tolower": strings.ToLower,
"normalize": normalize, "Normalize": Normalize,
"split": split, "split": split,
"contains": contains, "contains": contains,
} }
@ -112,7 +112,7 @@ func split(sep, s string) []string {
return strings.Split(s, sep) return strings.Split(s, sep)
} }
func normalize(name string) string { func Normalize(name string) string {
fargs := func(c rune) bool { fargs := func(c rune) bool {
return !unicode.IsLetter(c) && !unicode.IsNumber(c) return !unicode.IsLetter(c) && !unicode.IsNumber(c)
} }

10
provider/provider_test.go
View file

@ -91,7 +91,7 @@ func TestConfigurationErrors(t *testing.T) {
} }
for _, invalid := range invalids { for _, invalid := range invalids {
configuration, err := invalid.provider.getConfiguration(invalid.defaultTemplate, invalid.funcMap, nil) configuration, err := invalid.provider.GetConfiguration(invalid.defaultTemplate, invalid.funcMap, nil)
if err == nil || !strings.Contains(err.Error(), invalid.expectedError) { if err == nil || !strings.Contains(err.Error(), invalid.expectedError) {
t.Fatalf("should have generate an error with %q, got %v", invalid.expectedError, err) t.Fatalf("should have generate an error with %q, got %v", invalid.expectedError, err)
} }
@ -136,7 +136,7 @@ func TestGetConfiguration(t *testing.T) {
}, },
nil, nil,
} }
configuration, err := provider.getConfiguration(templateFile.Name(), nil, nil) configuration, err := provider.GetConfiguration(templateFile.Name(), nil, nil)
if err != nil { if err != nil {
t.Fatalf("Shouldn't have error out, got %v", err) t.Fatalf("Shouldn't have error out, got %v", err)
} }
@ -198,7 +198,7 @@ func TestGetConfigurationReturnsCorrectMaxConnConfiguration(t *testing.T) {
}, },
nil, nil,
} }
configuration, err := provider.getConfiguration(templateFile.Name(), nil, nil) configuration, err := provider.GetConfiguration(templateFile.Name(), nil, nil)
if err != nil { if err != nil {
t.Fatalf("Shouldn't have error out, got %v", err) t.Fatalf("Shouldn't have error out, got %v", err)
} }
@ -345,7 +345,7 @@ func TestDefaultFuncMap(t *testing.T) {
weight = 1 weight = 1
[frontends] [frontends]
[frontends.{{normalize "frontend/1"}}] [frontends.{{Normalize "frontend/1"}}]
{{ $backend := "backend1/test/value" | split "/" }} {{ $backend := "backend1/test/value" | split "/" }}
{{ $backendid := index $backend 1 }} {{ $backendid := index $backend 1 }}
{{ if "backend1" | contains "backend" }} {{ if "backend1" | contains "backend" }}
@ -366,7 +366,7 @@ func TestDefaultFuncMap(t *testing.T) {
}, },
nil, nil,
} }
configuration, err := provider.getConfiguration(templateFile.Name(), nil, nil) configuration, err := provider.GetConfiguration(templateFile.Name(), nil, nil)
if err != nil { if err != nil {
t.Fatalf("Shouldn't have error out, got %v", err) t.Fatalf("Shouldn't have error out, got %v", err)
} }

8
provider/rancher.go
View file

@ -79,7 +79,7 @@ func (provider *Rancher) getFrontendRule(service rancherData) string {
func (provider *Rancher) getFrontendName(service rancherData) string { func (provider *Rancher) getFrontendName(service rancherData) string {
// Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78 // Replace '.' with '-' in quoted keys because of this issue https://github.com/BurntSushi/toml/issues/78
return normalize(provider.getFrontendRule(service)) return Normalize(provider.getFrontendRule(service))
} }
// Backend Labels // Backend Labels
@ -122,9 +122,9 @@ func (provider *Rancher) getSticky(service rancherData) string {
func (provider *Rancher) getBackend(service rancherData) string { func (provider *Rancher) getBackend(service rancherData) string {
if label, err := getServiceLabel(service, "traefik.backend"); err == nil { if label, err := getServiceLabel(service, "traefik.backend"); err == nil {
return normalize(label) return Normalize(label)
} }
return normalize(service.Name) return Normalize(service.Name)
} }
// Generall Application Stuff // Generall Application Stuff
@ -436,7 +436,7 @@ func (provider *Rancher) loadRancherConfig(services []rancherData) *types.Config
provider.Domain, provider.Domain,
} }
configuration, err := provider.getConfiguration("templates/rancher.tmpl", RancherFuncMap, templateObjects) configuration, err := provider.GetConfiguration("templates/rancher.tmpl", RancherFuncMap, templateObjects)
if err != nil { if err != nil {
log.Error(err) log.Error(err)
} }