DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Avoid upstreams with multiple servers with the same port

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-03-16 08:20:52 -03:00
parent c25936df62
commit d82544fe80
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/pkg/ingress/controller/controller.go
View file

@ -991,6 +991,11 @@ func (ic *GenericController) getEndpoints(
upsServers := []ingress.Endpoint{} upsServers := []ingress.Endpoint{}
// avoid duplicated upstream servers when the service
// contains multiple port definitions sharing the same
// targetport.
adus := make(map[string]bool, 0)
for _, ss := range ep.Subsets { for _, ss := range ep.Subsets {
for _, epPort := range ss.Ports { for _, epPort := range ss.Ports {
@ -1031,6 +1036,10 @@ func (ic *GenericController) getEndpoints(
} }
for _, epAddress := range ss.Addresses { for _, epAddress := range ss.Addresses {
ep := fmt.Sprintf("%v:%v", epAddress.IP, targetPort)
if _, exists := adus[ep]; exists {
continue
}
ups := ingress.Endpoint{ ups := ingress.Endpoint{
Address: epAddress.IP, Address: epAddress.IP,
Port: fmt.Sprintf("%v", targetPort), Port: fmt.Sprintf("%v", targetPort),
@ -1038,6 +1047,7 @@ func (ic *GenericController) getEndpoints(
FailTimeout: hz.FailTimeout, FailTimeout: hz.FailTimeout,
} }
upsServers = append(upsServers, ups) upsServers = append(upsServers, ups)
adus[ep] = true
} }
} }
} }