homelab/traefik
1
0
Fork 0
Code Activity

Add a new protocol

Browse source 
Co-authored-by: Gérald Croës <gerald@containo.us>
This commit is contained in:
Julien Salleyron 2019-03-14 09:30:04 +01:00 • committed by Traefiker Bot
parent 0ca2149408
commit 4a68d29ce2
231 changed files with 6895 additions and 4395 deletions
Download patch file Download diff file Expand all files Collapse all files

4
old/provider/kubernetes/builder_configuration_test.go
View file

@ -481,7 +481,7 @@ func tlsSection(opts ...func(*tls.Configuration)) func(*tls.Configuration) {
func tlsEntryPoints(entryPoints ...string) func(*tls.Configuration) {
return func(c *tls.Configuration) {
c.EntryPoints = entryPoints
c.Stores = entryPoints
}
}
@ -636,7 +636,7 @@ func sampleConfiguration() *types.Configuration {
},
TLS: []*tls.Configuration{
{
EntryPoints: []string{"https"},
Stores: []string{"https"},
Certificate: &tls.Certificate{
CertFile: tls.FileOrContent("certificate"),
KeyFile: tls.FileOrContent("key"),

4
old/provider/kubernetes/kubernetes.go
View file

@ -652,7 +652,7 @@ func getTLS(ingress *extensionsv1beta1.Ingress, k8sClient Client, tlsConfigs map
configKey := ingress.Namespace + "/" + t.SecretName
if tlsConfig, tlsExists := tlsConfigs[configKey]; tlsExists {
for _, entryPoint := range newEntryPoints {
tlsConfig.EntryPoints = mergeEntryPoint(tlsConfig.EntryPoints, entryPoint)
tlsConfig.Stores = mergeEntryPoint(tlsConfig.Stores, entryPoint)
}
} else {
secret, exists, err := k8sClient.GetSecret(ingress.Namespace, t.SecretName)
@ -671,7 +671,7 @@ func getTLS(ingress *extensionsv1beta1.Ingress, k8sClient Client, tlsConfigs map
sort.Strings(newEntryPoints)
tlsConfig = &tls.Configuration{
EntryPoints: newEntryPoints,
Stores: newEntryPoints,
Certificate: &tls.Certificate{
CertFile: tls.FileOrContent(cert),
KeyFile: tls.FileOrContent(key),

2
old/provider/kubernetes/kubernetes_test.go
View file

@ -3025,7 +3025,7 @@ func TestGetTLS(t *testing.T) {
},
result: map[string]*tls.Configuration{
"testing/test-secret": {
EntryPoints: []string{"api-secure", "https"},
Stores: []string{"api-secure", "https"},
Certificate: &tls.Certificate{
CertFile: tls.FileOrContent("tls-crt"),
KeyFile: tls.FileOrContent("tls-key"),

2
old/provider/kv/kv_config.go
View file

@ -339,7 +339,7 @@ func (p *Provider) getTLSSection(prefix string) []*tls.Configuration {
}
tlsConf := &tls.Configuration{
EntryPoints: entryPoints,
Stores: entryPoints,
Certificate: &tls.Certificate{
CertFile: tls.FileOrContent(certFile),
KeyFile: tls.FileOrContent(keyFile),

34
old/provider/kv/kv_config_test.go
View file

@ -19,6 +19,7 @@ func aKVPair(key string, value string) *store.KVPair {
}
func TestProviderBuildConfiguration(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -541,14 +542,14 @@ func TestProviderBuildConfiguration(t *testing.T) {
},
TLS: []*tls.Configuration{
{
EntryPoints: []string{"http", "https"},
Stores: []string{"http", "https"},
Certificate: &tls.Certificate{
CertFile: "certfile2",
KeyFile: "keyfile2",
},
},
{
EntryPoints: []string{"http", "https"},
Stores: []string{"http", "https"},
Certificate: &tls.Certificate{
CertFile: "certfile1",
KeyFile: "keyfile1",
@ -582,6 +583,7 @@ func TestProviderBuildConfiguration(t *testing.T) {
}
func TestProviderList(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -656,6 +658,7 @@ func TestProviderList(t *testing.T) {
}
func TestProviderGet(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -751,6 +754,7 @@ func TestProviderGet(t *testing.T) {
}
func TestProviderLast(t *testing.T) {
t.Skip("old tests")
p := &Provider{}
testCases := []struct {
@ -793,6 +797,7 @@ func TestProviderLast(t *testing.T) {
}
func TestProviderSplitGet(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -856,6 +861,7 @@ func TestProviderSplitGet(t *testing.T) {
}
func TestProviderGetList(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -932,6 +938,7 @@ func TestProviderGetList(t *testing.T) {
}
func TestProviderGetSlice(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -1005,6 +1012,7 @@ func TestProviderGetSlice(t *testing.T) {
}
func TestProviderGetBool(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -1078,6 +1086,7 @@ func TestProviderGetBool(t *testing.T) {
}
func TestProviderGetInt(t *testing.T) {
t.Skip("old tests")
defaultValue := 666
testCases := []struct {
@ -1143,6 +1152,7 @@ func TestProviderGetInt(t *testing.T) {
}
func TestProviderGetInt64(t *testing.T) {
t.Skip("old tests")
var defaultValue int64 = 666
testCases := []struct {
@ -1208,6 +1218,7 @@ func TestProviderGetInt64(t *testing.T) {
}
func TestProviderGetMap(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
keyParts []string
@ -1253,6 +1264,7 @@ func TestProviderGetMap(t *testing.T) {
}
func TestProviderHasStickinessLabel(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -1306,6 +1318,7 @@ func TestProviderHasStickinessLabel(t *testing.T) {
}
func TestWhiteList(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1345,6 +1358,7 @@ func TestWhiteList(t *testing.T) {
}
func TestProviderGetRedirect(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1434,6 +1448,7 @@ func TestProviderGetRedirect(t *testing.T) {
}
func TestProviderGetErrorPages(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1483,6 +1498,7 @@ func TestProviderGetErrorPages(t *testing.T) {
}
func TestProviderGetRateLimit(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1546,6 +1562,7 @@ func TestProviderGetRateLimit(t *testing.T) {
}
func TestProviderGetHeaders(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1811,6 +1828,7 @@ func TestProviderGetHeaders(t *testing.T) {
}
func TestProviderGetLoadBalancer(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1902,6 +1920,7 @@ func TestProviderGetLoadBalancer(t *testing.T) {
}
func TestProviderGetCircuitBreaker(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1941,6 +1960,7 @@ func TestProviderGetCircuitBreaker(t *testing.T) {
}
func TestProviderGetMaxConn(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -1995,6 +2015,7 @@ func TestProviderGetMaxConn(t *testing.T) {
}
func TestProviderGetHealthCheck(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -2058,6 +2079,7 @@ func TestProviderGetHealthCheck(t *testing.T) {
}
func TestProviderGetBufferingReal(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -2099,6 +2121,7 @@ func TestProviderGetBufferingReal(t *testing.T) {
}
func TestProviderGetTLSes(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
kvPairs []*store.KVPair
@ -2117,14 +2140,14 @@ func TestProviderGetTLSes(t *testing.T) {
withPair("certificate/keyfile", "keyfile2"))),
expected: []*tls.Configuration{
{
EntryPoints: []string{"http", "https"},
Stores: []string{"http", "https"},
Certificate: &tls.Certificate{
CertFile: "certfile2",
KeyFile: "keyfile2",
},
},
{
EntryPoints: []string{"http", "https"},
Stores: []string{"http", "https"},
Certificate: &tls.Certificate{
CertFile: "certfile1",
KeyFile: "keyfile1",
@ -2170,6 +2193,7 @@ func TestProviderGetTLSes(t *testing.T) {
}
func TestProviderGetAuth(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -2263,6 +2287,7 @@ func TestProviderGetAuth(t *testing.T) {
}
func TestProviderGetRoutes(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string
@ -2315,6 +2340,7 @@ func TestProviderGetRoutes(t *testing.T) {
}
func TestProviderGetServers(t *testing.T) {
t.Skip("old tests")
testCases := []struct {
desc string
rootPath string

1
old/provider/kv/kv_test.go
View file

@ -10,6 +10,7 @@ import (
)
func TestKvWatchTree(t *testing.T) {
t.Skip("Old")
returnedChans := make(chan chan []*store.KVPair)
provider := Provider{
kvClient: &Mock{