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

Return sorted endpoints

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-02-21 11:04:08 -03:00
parent 036892fb96
commit 7013a52ee5
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/nginx/Makefile
View file

@ -3,7 +3,7 @@ all: push
BUILDTAGS= BUILDTAGS=
# Use the 0.0 tag for testing, it shouldn't clobber any release builds # Use the 0.0 tag for testing, it shouldn't clobber any release builds
RELEASE?=0.9.0-beta.1 RELEASE?=0.9.0-beta.2
PREFIX?=gcr.io/google_containers/nginx-ingress-controller PREFIX?=gcr.io/google_containers/nginx-ingress-controller
GOOS?=linux GOOS?=linux

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

@ -658,7 +658,6 @@ func (ic *GenericController) getBackendServers() ([]*ingress.Backend, []*ingress
glog.V(3).Infof("upstream %v does not have any active endpoints. Using default backend", value.Name) glog.V(3).Infof("upstream %v does not have any active endpoints. Using default backend", value.Name)
value.Endpoints = append(value.Endpoints, newDefaultServer()) value.Endpoints = append(value.Endpoints, newDefaultServer())
} }
sort.Sort(ingress.EndpointByAddrPort(value.Endpoints))
aUpstreams = append(aUpstreams, value) aUpstreams = append(aUpstreams, value)
} }
sort.Sort(ingress.BackendByNameServers(aUpstreams)) sort.Sort(ingress.BackendByNameServers(aUpstreams))
@ -794,6 +793,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
glog.Warningf("service %v does not have any active endpoints", svcKey) glog.Warningf("service %v does not have any active endpoints", svcKey)
} }
sort.Sort(ingress.EndpointByAddrPort(endps))
upstreams = append(upstreams, endps...) upstreams = append(upstreams, endps...)
break break
} }