homelab/traefik
1
0
Fork 0
Code Activity

Merge current v2.8 into master

Browse source
This commit is contained in:
romain 2022-08-31 18:19:31 +02:00
commit 703de5331b
30 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/provider/acme/provider_test.go
View file

@ -26,7 +26,7 @@ func TestGetUncheckedCertificates(t *testing.T) {
domainSafe := &safe.Safe{}
domainSafe.Set(domainMap)
// FIXME Add a test for DefaultCertificate
// TODO Add a test for DefaultCertificate
testCases := []struct {
desc string
dynamicCerts *safe.Safe

12
pkg/provider/consulcatalog/config.go
View file

@ -140,9 +140,9 @@ func (p *Provider) buildTCPServiceConfiguration(item itemData, configuration *dy
}
}
for _, service := range configuration.Services {
for name, service := range configuration.Services {
if err := p.addServerTCP(item, service.LoadBalancer); err != nil {
return err
return fmt.Errorf("%s: %w", name, err)
}
}
@ -160,9 +160,9 @@ func (p *Provider) buildUDPServiceConfiguration(item itemData, configuration *dy
}
}
for _, service := range configuration.Services {
for name, service := range configuration.Services {
if err := p.addServerUDP(item, service.LoadBalancer); err != nil {
return err
return fmt.Errorf("%s: %w", name, err)
}
}
@ -181,9 +181,9 @@ func (p *Provider) buildServiceConfiguration(item itemData, configuration *dynam
}
}
for _, service := range configuration.Services {
for name, service := range configuration.Services {
if err := p.addServer(item, service.LoadBalancer); err != nil {
return err
return fmt.Errorf("%s: %w", name, err)
}
}

3
pkg/provider/docker/docker.go
View file

@ -206,6 +206,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
logger.Errorf("Failed to create a client for docker, error: %s", err)
return err
}
defer dockerClient.Close()
serverVersion, err := dockerClient.ServerVersion(ctx)
if err != nil {
@ -250,7 +251,7 @@ func (p *Provider) Provide(configurationChan chan<- dynamic.Message, pool *safe.
case <-ticker.C:
services, err := p.listServices(ctx, dockerClient)
if err != nil {
logger.Errorf("Failed to list services for docker, error %s", err)
logger.Errorf("Failed to list services for docker swarm mode, error %s", err)
errChan <- err
return
}

2
pkg/provider/kubernetes/crd/fixtures/with_servers_transport.yml
View file

@ -46,7 +46,7 @@ metadata:
data:
ca.crt: VEVTVFJPT1RDQVM0
tls.ca: VEVTVFJPT1RDQVM1 # <-- This should be the prefered one.
tls.ca: VEVTVFJPT1RDQVM1 # <-- This should be the preferred one.
---
apiVersion: v1

2
pkg/provider/kv/kv_mock_test.go
View file

@ -97,7 +97,7 @@ func (s *Mock) List(ctx context.Context, prefix string, options *store.ReadOptio
}
var kv []*store.KVPair
for _, kvPair := range s.KVPairs {
if strings.HasPrefix(kvPair.Key, prefix) { // FIXME && !strings.ContainsAny(strings.TrimPrefix(kvPair.Key, prefix), "/") {
if strings.HasPrefix(kvPair.Key, prefix) {
kv = append(kv, kvPair)
}
}