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

providers: simplify AddServer algorithms

Browse source
This commit is contained in:
Ludovic Fernandez 2022-09-21 14:54:08 +02:00 committed by GitHub
parent 83ae1021f6
commit 7ac687a0a9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 101 additions and 139 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
pkg/provider/docker/config.go
View file

@ -187,28 +187,24 @@ func (p *Provider) addServerTCP(ctx context.Context, container dockerData, loadB
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string if len(loadBalancer.Servers) == 0 {
if len(loadBalancer.Servers) > 0 { loadBalancer.Servers = []dynamic.TCPServer{{}}
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(ctx, container, serverPort) ip, port, err := p.getIPPort(ctx, container, serverPort)
if err != nil { if err != nil {
return err return err
} }
if len(loadBalancer.Servers) == 0 {
server := dynamic.TCPServer{}
loadBalancer.Servers = []dynamic.TCPServer{server}
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }
loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port) loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port)
return nil return nil
} }
@ -217,28 +213,24 @@ func (p *Provider) addServerUDP(ctx context.Context, container dockerData, loadB
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string if len(loadBalancer.Servers) == 0 {
if len(loadBalancer.Servers) > 0 { loadBalancer.Servers = []dynamic.UDPServer{{}}
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(ctx, container, serverPort) ip, port, err := p.getIPPort(ctx, container, serverPort)
if err != nil { if err != nil {
return err return err
} }
if len(loadBalancer.Servers) == 0 {
server := dynamic.UDPServer{}
loadBalancer.Servers = []dynamic.UDPServer{server}
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }
loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port) loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port)
return nil return nil
} }
@ -247,17 +239,6 @@ func (p *Provider) addServer(ctx context.Context, container dockerData, loadBala
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string
if len(loadBalancer.Servers) > 0 {
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
}
ip, port, err := p.getIPPort(ctx, container, serverPort)
if err != nil {
return err
}
if len(loadBalancer.Servers) == 0 { if len(loadBalancer.Servers) == 0 {
server := dynamic.Server{} server := dynamic.Server{}
server.SetDefaults() server.SetDefaults()
@ -265,6 +246,14 @@ func (p *Provider) addServer(ctx context.Context, container dockerData, loadBala
loadBalancer.Servers = []dynamic.Server{server} loadBalancer.Servers = []dynamic.Server{server}
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(ctx, container, serverPort)
if err != nil {
return err
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }

53
pkg/provider/ecs/config.go
View file

@ -185,7 +185,7 @@ func (p *Provider) filterInstance(ctx context.Context, instance ecsInstance) boo
matches, err := constraints.MatchLabels(instance.Labels, p.Constraints) matches, err := constraints.MatchLabels(instance.Labels, p.Constraints)
if err != nil { if err != nil {
logger.Errorf("Error matching constraints expression: %v", err) logger.Errorf("Error matching constraint expression: %v", err)
return false return false
} }
if !matches { if !matches {
@ -201,28 +201,24 @@ func (p *Provider) addServerTCP(instance ecsInstance, loadBalancer *dynamic.TCPS
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string if len(loadBalancer.Servers) == 0 {
if len(loadBalancer.Servers) > 0 { loadBalancer.Servers = []dynamic.TCPServer{{}}
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(instance, serverPort) ip, port, err := p.getIPPort(instance, serverPort)
if err != nil { if err != nil {
return err return err
} }
if len(loadBalancer.Servers) == 0 {
server := dynamic.TCPServer{}
loadBalancer.Servers = []dynamic.TCPServer{server}
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }
loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port) loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port)
return nil return nil
} }
@ -231,28 +227,24 @@ func (p *Provider) addServerUDP(instance ecsInstance, loadBalancer *dynamic.UDPS
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string if len(loadBalancer.Servers) == 0 {
if len(loadBalancer.Servers) > 0 { loadBalancer.Servers = []dynamic.UDPServer{{}}
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(instance, serverPort) ip, port, err := p.getIPPort(instance, serverPort)
if err != nil { if err != nil {
return err return err
} }
if len(loadBalancer.Servers) == 0 {
server := dynamic.UDPServer{}
loadBalancer.Servers = []dynamic.UDPServer{server}
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }
loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port) loadBalancer.Servers[0].Address = net.JoinHostPort(ip, port)
return nil return nil
} }
@ -261,17 +253,6 @@ func (p *Provider) addServer(instance ecsInstance, loadBalancer *dynamic.Servers
return errors.New("load-balancer is not defined") return errors.New("load-balancer is not defined")
} }
var serverPort string
if len(loadBalancer.Servers) > 0 {
serverPort = loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
}
ip, port, err := p.getIPPort(instance, serverPort)
if err != nil {
return err
}
if len(loadBalancer.Servers) == 0 { if len(loadBalancer.Servers) == 0 {
server := dynamic.Server{} server := dynamic.Server{}
server.SetDefaults() server.SetDefaults()
@ -279,6 +260,14 @@ func (p *Provider) addServer(instance ecsInstance, loadBalancer *dynamic.Servers
loadBalancer.Servers = []dynamic.Server{server} loadBalancer.Servers = []dynamic.Server{server}
} }
serverPort := loadBalancer.Servers[0].Port
loadBalancer.Servers[0].Port = ""
ip, port, err := p.getIPPort(instance, serverPort)
if err != nil {
return err
}
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }

71
pkg/provider/nomad/config.go
View file

@ -172,29 +172,27 @@ func (p *Provider) addServerTCP(i item, lb *dynamic.TCPServersLoadBalancer) erro
return errors.New("load-balancer is missing") return errors.New("load-balancer is missing")
} }
var port string
if len(lb.Servers) > 0 {
port = lb.Servers[0].Port
}
if len(lb.Servers) == 0 { if len(lb.Servers) == 0 {
lb.Servers = []dynamic.TCPServer{{}} lb.Servers = []dynamic.TCPServer{{}}
} }
if i.Port != 0 && port == "" {
port = strconv.Itoa(i.Port)
}
lb.Servers[0].Port = ""
if port == "" {
return errors.New("port is missing")
}
if i.Address == "" { if i.Address == "" {
return errors.New("address is missing") return errors.New("address is missing")
} }
port := lb.Servers[0].Port
lb.Servers[0].Port = ""
if port == "" && i.Port > 0 {
port = strconv.Itoa(i.Port)
}
if port == "" {
return errors.New("port is missing")
}
lb.Servers[0].Address = net.JoinHostPort(i.Address, port) lb.Servers[0].Address = net.JoinHostPort(i.Address, port)
return nil return nil
} }
@ -203,29 +201,27 @@ func (p *Provider) addServerUDP(i item, lb *dynamic.UDPServersLoadBalancer) erro
return errors.New("load-balancer is missing") return errors.New("load-balancer is missing")
} }
var port string
if len(lb.Servers) > 0 {
port = lb.Servers[0].Port
}
if len(lb.Servers) == 0 { if len(lb.Servers) == 0 {
lb.Servers = []dynamic.UDPServer{{}} lb.Servers = []dynamic.UDPServer{{}}
} }
if i.Port != 0 && port == "" {
port = strconv.Itoa(i.Port)
}
lb.Servers[0].Port = ""
if port == "" {
return errors.New("port is missing")
}
if i.Address == "" { if i.Address == "" {
return errors.New("address is missing") return errors.New("address is missing")
} }
port := lb.Servers[0].Port
lb.Servers[0].Port = ""
if port == "" && i.Port > 0 {
port = strconv.Itoa(i.Port)
}
if port == "" {
return errors.New("port is missing")
}
lb.Servers[0].Address = net.JoinHostPort(i.Address, port) lb.Servers[0].Address = net.JoinHostPort(i.Address, port)
return nil return nil
} }
@ -234,11 +230,6 @@ func (p *Provider) addServer(i item, lb *dynamic.ServersLoadBalancer) error {
return errors.New("load-balancer is missing") return errors.New("load-balancer is missing")
} }
var port string
if len(lb.Servers) > 0 {
port = lb.Servers[0].Port
}
if len(lb.Servers) == 0 { if len(lb.Servers) == 0 {
server := dynamic.Server{} server := dynamic.Server{}
server.SetDefaults() server.SetDefaults()
@ -246,19 +237,21 @@ func (p *Provider) addServer(i item, lb *dynamic.ServersLoadBalancer) error {
lb.Servers = []dynamic.Server{server} lb.Servers = []dynamic.Server{server}
} }
if i.Port != 0 && port == "" { if i.Address == "" {
return errors.New("address is missing")
}
port := lb.Servers[0].Port
lb.Servers[0].Port = ""
if port == "" && i.Port > 0 {
port = strconv.Itoa(i.Port) port = strconv.Itoa(i.Port)
} }
lb.Servers[0].Port = ""
if port == "" { if port == "" {
return errors.New("port is missing") return errors.New("port is missing")
} }
if i.Address == "" {
return errors.New("address is missing")
}
scheme := lb.Servers[0].Scheme scheme := lb.Servers[0].Scheme
lb.Servers[0].Scheme = "" lb.Servers[0].Scheme = ""
lb.Servers[0].URL = fmt.Sprintf("%s://%s", scheme, net.JoinHostPort(i.Address, port)) lb.Servers[0].URL = fmt.Sprintf("%s://%s", scheme, net.JoinHostPort(i.Address, port))

65
pkg/provider/rancher/config.go
View file

@ -160,7 +160,7 @@ func (p *Provider) keepService(ctx context.Context, service rancherData) bool {
matches, err := constraints.MatchLabels(service.Labels, p.Constraints) matches, err := constraints.MatchLabels(service.Labels, p.Constraints)
if err != nil { if err != nil {
logger.Errorf("Error matching constraints expression: %v", err) logger.Errorf("Error matching constraint expression: %v", err)
return false return false
} }
if !matches { if !matches {
@ -185,23 +185,19 @@ func (p *Provider) keepService(ctx context.Context, service rancherData) bool {
func (p *Provider) addServerTCP(ctx context.Context, service rancherData, loadBalancer *dynamic.TCPServersLoadBalancer) error { func (p *Provider) addServerTCP(ctx context.Context, service rancherData, loadBalancer *dynamic.TCPServersLoadBalancer) error {
log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name) log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name)
serverPort := "" if loadBalancer == nil {
return errors.New("load-balancer is not defined")
if loadBalancer != nil && len(loadBalancer.Servers) > 0 {
serverPort = loadBalancer.Servers[0].Port
} }
port := getServicePort(service)
if len(loadBalancer.Servers) == 0 { if len(loadBalancer.Servers) == 0 {
server := dynamic.TCPServer{} loadBalancer.Servers = []dynamic.TCPServer{{}}
loadBalancer.Servers = []dynamic.TCPServer{server}
} }
if serverPort != "" { port := loadBalancer.Servers[0].Port
port = serverPort loadBalancer.Servers[0].Port = ""
loadBalancer.Servers[0].Port = ""
if port == "" {
port = getServicePort(service)
} }
if port == "" { if port == "" {
@ -216,29 +212,26 @@ func (p *Provider) addServerTCP(ctx context.Context, service rancherData, loadBa
} }
loadBalancer.Servers = servers loadBalancer.Servers = servers
return nil return nil
} }
func (p *Provider) addServerUDP(ctx context.Context, service rancherData, loadBalancer *dynamic.UDPServersLoadBalancer) error { func (p *Provider) addServerUDP(ctx context.Context, service rancherData, loadBalancer *dynamic.UDPServersLoadBalancer) error {
log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name) log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name)
serverPort := "" if loadBalancer == nil {
return errors.New("load-balancer is not defined")
if loadBalancer != nil && len(loadBalancer.Servers) > 0 {
serverPort = loadBalancer.Servers[0].Port
} }
port := getServicePort(service)
if len(loadBalancer.Servers) == 0 { if len(loadBalancer.Servers) == 0 {
server := dynamic.UDPServer{} loadBalancer.Servers = []dynamic.UDPServer{{}}
loadBalancer.Servers = []dynamic.UDPServer{server}
} }
if serverPort != "" { port := loadBalancer.Servers[0].Port
port = serverPort loadBalancer.Servers[0].Port = ""
loadBalancer.Servers[0].Port = ""
if port == "" {
port = getServicePort(service)
} }
if port == "" { if port == "" {
@ -253,14 +246,16 @@ func (p *Provider) addServerUDP(ctx context.Context, service rancherData, loadBa
} }
loadBalancer.Servers = servers loadBalancer.Servers = servers
return nil return nil
} }
func (p *Provider) addServers(ctx context.Context, service rancherData, loadBalancer *dynamic.ServersLoadBalancer) error { func (p *Provider) addServers(ctx context.Context, service rancherData, loadBalancer *dynamic.ServersLoadBalancer) error {
log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name) log.FromContext(ctx).Debugf("Trying to add servers for service %s \n", service.Name)
serverPort := getLBServerPort(loadBalancer) if loadBalancer == nil {
port := getServicePort(service) return errors.New("load-balancer is not defined")
}
if len(loadBalancer.Servers) == 0 { if len(loadBalancer.Servers) == 0 {
server := dynamic.Server{} server := dynamic.Server{}
@ -269,9 +264,11 @@ func (p *Provider) addServers(ctx context.Context, service rancherData, loadBala
loadBalancer.Servers = []dynamic.Server{server} loadBalancer.Servers = []dynamic.Server{server}
} }
if serverPort != "" { port := loadBalancer.Servers[0].Port
port = serverPort loadBalancer.Servers[0].Port = ""
loadBalancer.Servers[0].Port = ""
if port == "" {
port = getServicePort(service)
} }
if port == "" { if port == "" {
@ -286,14 +283,8 @@ func (p *Provider) addServers(ctx context.Context, service rancherData, loadBala
} }
loadBalancer.Servers = servers loadBalancer.Servers = servers
return nil
}
func getLBServerPort(loadBalancer *dynamic.ServersLoadBalancer) string { return nil
if loadBalancer != nil && len(loadBalancer.Servers) > 0 {
return loadBalancer.Servers[0].Port
}
return ""
} }
func getServicePort(data rancherData) string { func getServicePort(data rancherData) string {