homelab/traefik
1
0
Fork 0
Code Activity

Merge branch v2.3 into master

Browse source
This commit is contained in:
Fernandez Ludovic 2020-09-17 12:06:57 +02:00
commit 86c099d629
440 changed files with 5538 additions and 5466 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/config/dynamic/config.go
View file

@ -1,7 +1,7 @@
package dynamic
import (
"github.com/containous/traefik/v2/pkg/tls"
"github.com/traefik/traefik/v2/pkg/tls"
)
// +k8s:deepcopy-gen=true

4
pkg/config/dynamic/http_config.go
View file

@ -4,9 +4,9 @@ import (
"reflect"
"time"
"github.com/containous/traefik/v2/pkg/tls"
"github.com/containous/traefik/v2/pkg/types"
ptypes "github.com/traefik/paerser/types"
"github.com/traefik/traefik/v2/pkg/tls"
"github.com/traefik/traefik/v2/pkg/types"
)
// +k8s:deepcopy-gen=true

2
pkg/config/dynamic/middlewares.go
View file

@ -8,8 +8,8 @@ import (
"os"
"time"
"github.com/containous/traefik/v2/pkg/ip"
ptypes "github.com/traefik/paerser/types"
"github.com/traefik/traefik/v2/pkg/ip"
)
// +k8s:deepcopy-gen=true

2
pkg/config/dynamic/tcp_config.go
View file

@ -3,7 +3,7 @@ package dynamic
import (
"reflect"
"github.com/containous/traefik/v2/pkg/types"
"github.com/traefik/traefik/v2/pkg/types"
)
// +k8s:deepcopy-gen=true

6
pkg/config/dynamic/zz_generated.deepcopy.go
View file

@ -3,7 +3,7 @@
/*
The MIT License (MIT)
Copyright (c) 2016-2020 Containous SAS
Copyright (c) 2016-2020 Containous SAS; 2020-2020 Traefik Labs
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@ -29,8 +29,8 @@ THE SOFTWARE.
package dynamic
import (
tls "github.com/containous/traefik/v2/pkg/tls"
types "github.com/containous/traefik/v2/pkg/types"
tls "github.com/traefik/traefik/v2/pkg/tls"
types "github.com/traefik/traefik/v2/pkg/types"
)
// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.

2
pkg/config/label/label.go
View file

@ -2,8 +2,8 @@
package label
import (
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/traefik/paerser/parser"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
)
// DecodeConfiguration converts the labels to a configuration.

2
pkg/config/label/label_test.go
View file

@ -5,10 +5,10 @@ import (
"testing"
"time"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
ptypes "github.com/traefik/paerser/types"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
)
func TestDecodeConfiguration(t *testing.T) {

4
pkg/config/runtime/runtime.go
View file

@ -4,8 +4,8 @@ import (
"sort"
"strings"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
)
// Status of the router/service.

4
pkg/config/runtime/runtime_http.go
View file

@ -6,8 +6,8 @@ import (
"sort"
"sync"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
)
// GetRoutersByEntryPoints returns all the http routers by entry points name and routers name.

2
pkg/config/runtime/runtime_http_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/stretchr/testify/assert"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
)
func TestGetRoutersByEntryPoints(t *testing.T) {

4
pkg/config/runtime/runtime_tcp.go
View file

@ -4,8 +4,8 @@ import (
"context"
"fmt"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
)
// GetTCPRoutersByEntryPoints returns all the tcp routers by entry points name and routers name.

2
pkg/config/runtime/runtime_tcp_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/stretchr/testify/assert"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
)
func TestGetTCPRoutersByEntryPoints(t *testing.T) {

4
pkg/config/runtime/runtime_test.go
View file

@ -3,10 +3,10 @@ package runtime_test
import (
"testing"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/config/runtime"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/config/runtime"
)
// all the Routers/Middlewares/Services are considered fully qualified.

4
pkg/config/runtime/runtime_udp.go
View file

@ -4,8 +4,8 @@ import (
"context"
"fmt"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/containous/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
"github.com/traefik/traefik/v2/pkg/log"
)
// GetUDPRoutersByEntryPoints returns all the UDP routers by entry points name and routers name.

2
pkg/config/runtime/runtime_udp_test.go
View file

@ -4,8 +4,8 @@ import (
"context"
"testing"
"github.com/containous/traefik/v2/pkg/config/dynamic"
"github.com/stretchr/testify/assert"
"github.com/traefik/traefik/v2/pkg/config/dynamic"
)
func TestGetUDPRoutersByEntryPoints(t *testing.T) {

2
pkg/config/static/entrypoints.go
View file

@ -5,7 +5,7 @@ import (
"math"
"strings"
"github.com/containous/traefik/v2/pkg/types"
"github.com/traefik/traefik/v2/pkg/types"
)
// EntryPoint holds the entry point configuration.

9
pkg/config/static/experimental.go
View file

@ -1,16 +1,9 @@
package static
import "github.com/containous/traefik/v2/pkg/plugins"
import "github.com/traefik/traefik/v2/pkg/plugins"
// Experimental experimental Traefik features.
type Experimental struct {
Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omitempty" toml:"pilot,omitempty" yaml:"pilot,omitempty"`
Plugins map[string]plugins.Descriptor `description:"Plugins configuration." json:"plugins,omitempty" toml:"plugins,omitempty" yaml:"plugins,omitempty"`
DevPlugin *plugins.DevPlugin `description:"Dev plugin configuration." json:"devPlugin,omitempty" toml:"devPlugin,omitempty" yaml:"devPlugin,omitempty"`
}
// Pilot Configuration related to Traefik Pilot.
type Pilot struct {
Token string `description:"Traefik Pilot token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty"`
}

6
pkg/config/static/pilot.go Normal file
View file

@ -0,0 +1,6 @@
package static
// Pilot Configuration related to Traefik Pilot.
type Pilot struct {
Token string `description:"Traefik Pilot token." json:"token,omitempty" toml:"token,omitempty" yaml:"token,omitempty"`
}

52
pkg/config/static/static_config.go
View file

@ -6,35 +6,35 @@ import (
"strings"
"time"
"github.com/containous/traefik/v2/pkg/log"
"github.com/containous/traefik/v2/pkg/ping"
acmeprovider "github.com/containous/traefik/v2/pkg/provider/acme"
"github.com/containous/traefik/v2/pkg/provider/consulcatalog"
"github.com/containous/traefik/v2/pkg/provider/docker"
"github.com/containous/traefik/v2/pkg/provider/ecs"
"github.com/containous/traefik/v2/pkg/provider/file"
"github.com/containous/traefik/v2/pkg/provider/http"
"github.com/containous/traefik/v2/pkg/provider/kubernetes/crd"
"github.com/containous/traefik/v2/pkg/provider/kubernetes/ingress"
"github.com/containous/traefik/v2/pkg/provider/kv/consul"
"github.com/containous/traefik/v2/pkg/provider/kv/etcd"
"github.com/containous/traefik/v2/pkg/provider/kv/redis"
"github.com/containous/traefik/v2/pkg/provider/kv/zk"
"github.com/containous/traefik/v2/pkg/provider/marathon"
"github.com/containous/traefik/v2/pkg/provider/rancher"
"github.com/containous/traefik/v2/pkg/provider/rest"
"github.com/containous/traefik/v2/pkg/tls"
"github.com/containous/traefik/v2/pkg/tracing/datadog"
"github.com/containous/traefik/v2/pkg/tracing/elastic"
"github.com/containous/traefik/v2/pkg/tracing/haystack"
"github.com/containous/traefik/v2/pkg/tracing/instana"
"github.com/containous/traefik/v2/pkg/tracing/jaeger"
"github.com/containous/traefik/v2/pkg/tracing/zipkin"
"github.com/containous/traefik/v2/pkg/types"
assetfs "github.com/elazarl/go-bindata-assetfs"
legolog "github.com/go-acme/lego/v4/log"
"github.com/sirupsen/logrus"
ptypes "github.com/traefik/paerser/types"
"github.com/traefik/traefik/v2/pkg/log"
"github.com/traefik/traefik/v2/pkg/ping"
acmeprovider "github.com/traefik/traefik/v2/pkg/provider/acme"
"github.com/traefik/traefik/v2/pkg/provider/consulcatalog"
"github.com/traefik/traefik/v2/pkg/provider/docker"
"github.com/traefik/traefik/v2/pkg/provider/ecs"
"github.com/traefik/traefik/v2/pkg/provider/file"
"github.com/traefik/traefik/v2/pkg/provider/http"
"github.com/traefik/traefik/v2/pkg/provider/kubernetes/crd"
"github.com/traefik/traefik/v2/pkg/provider/kubernetes/ingress"
"github.com/traefik/traefik/v2/pkg/provider/kv/consul"
"github.com/traefik/traefik/v2/pkg/provider/kv/etcd"
"github.com/traefik/traefik/v2/pkg/provider/kv/redis"
"github.com/traefik/traefik/v2/pkg/provider/kv/zk"
"github.com/traefik/traefik/v2/pkg/provider/marathon"
"github.com/traefik/traefik/v2/pkg/provider/rancher"
"github.com/traefik/traefik/v2/pkg/provider/rest"
"github.com/traefik/traefik/v2/pkg/tls"
"github.com/traefik/traefik/v2/pkg/tracing/datadog"
"github.com/traefik/traefik/v2/pkg/tracing/elastic"
"github.com/traefik/traefik/v2/pkg/tracing/haystack"
"github.com/traefik/traefik/v2/pkg/tracing/instana"
"github.com/traefik/traefik/v2/pkg/tracing/jaeger"
"github.com/traefik/traefik/v2/pkg/tracing/zipkin"
"github.com/traefik/traefik/v2/pkg/types"
)
const (
@ -72,6 +72,8 @@ type Configuration struct {
CertificatesResolvers map[string]CertificateResolver `description:"Certificates resolvers configuration." json:"certificatesResolvers,omitempty" toml:"certificatesResolvers,omitempty" yaml:"certificatesResolvers,omitempty" export:"true"`
Pilot *Pilot `description:"Traefik Pilot configuration." json:"pilot,omitempty" toml:"pilot,omitempty" yaml:"pilot,omitempty"`
Experimental *Experimental `description:"experimental features." json:"experimental,omitempty" toml:"experimental,omitempty" yaml:"experimental,omitempty"`
}