From d1899ff25030c348d96fbe5a3a721be7e99ad3fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= Date: Thu, 26 Jan 2023 09:40:23 +0100 Subject: [PATCH 1/3] Use DDNS for swarm load balancing --- pkg/provider/docker/docker.go | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index 2e902cf8a..d0cacdf39 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -509,7 +509,20 @@ func (p *Provider) parseService(ctx context.Context, service swarmtypes.Service, if service.Spec.EndpointSpec != nil { if service.Spec.EndpointSpec.Mode == swarmtypes.ResolutionModeDNSRR { if dData.ExtraConf.Docker.LBSwarm { - logger.Warn().Msgf("Ignored %s endpoint-mode not supported, service name: %s. Fallback to Traefik load balancing", swarmtypes.ResolutionModeDNSRR, service.Spec.Annotations.Name) + dData.NetworkSettings.Networks = make(map[string]*networkData) + for _, virtualIP := range service.Endpoint.VirtualIPs { + networkService := networkMap[virtualIP.NetworkID] + if networkService != nil { + network := &networkData{ + Name: networkService.Name, + ID: virtualIP.NetworkID, + Addr: "tasks." + service.Spec.Name, + } + dData.NetworkSettings.Networks[network.Name] = network + } else { + logger.Debug().Msgf("Network not found, id: %s", virtualIP.NetworkID) + } + } } } else if service.Spec.EndpointSpec.Mode == swarmtypes.ResolutionModeVIP { dData.NetworkSettings.Networks = make(map[string]*networkData) From a2089c3a5d6ddc4d5ad16a9a6e632e48b1039303 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= Date: Thu, 2 Feb 2023 21:26:49 +0100 Subject: [PATCH 2/3] CI build trigger. --- pkg/provider/docker/docker.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index d0cacdf39..01f0561fa 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -523,6 +523,8 @@ func (p *Provider) parseService(ctx context.Context, service swarmtypes.Service, logger.Debug().Msgf("Network not found, id: %s", virtualIP.NetworkID) } } + } else { + // Each service task IP will get extracted later on in parseTasks } } else if service.Spec.EndpointSpec.Mode == swarmtypes.ResolutionModeVIP { dData.NetworkSettings.Networks = make(map[string]*networkData) From 1c0b30963bdc273fb42dcaff578287cd8b746c16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Van=C3=AD=C4=8Dek?= Date: Fri, 3 Feb 2023 00:11:24 +0100 Subject: [PATCH 3/3] In DNSRR there is no Endpoint.VirtualIPs - use Spec.TaskTemplate.Networks --- pkg/provider/docker/docker.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/provider/docker/docker.go b/pkg/provider/docker/docker.go index 01f0561fa..63040e31d 100644 --- a/pkg/provider/docker/docker.go +++ b/pkg/provider/docker/docker.go @@ -510,17 +510,17 @@ func (p *Provider) parseService(ctx context.Context, service swarmtypes.Service, if service.Spec.EndpointSpec.Mode == swarmtypes.ResolutionModeDNSRR { if dData.ExtraConf.Docker.LBSwarm { dData.NetworkSettings.Networks = make(map[string]*networkData) - for _, virtualIP := range service.Endpoint.VirtualIPs { - networkService := networkMap[virtualIP.NetworkID] + for _, net := range service.Spec.TaskTemplate.Networks { + networkService := networkMap[net.Target] if networkService != nil { network := &networkData{ Name: networkService.Name, - ID: virtualIP.NetworkID, + ID: net.Target, Addr: "tasks." + service.Spec.Name, } dData.NetworkSettings.Networks[network.Name] = network } else { - logger.Debug().Msgf("Network not found, id: %s", virtualIP.NetworkID) + logger.Debug().Msgf("Network not found, id: %s", net.Target) } } } else {