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

Merge a970ef834d into cdbf2aad37

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-06-13 00:27:54 +00:00 committed by GitHub
commit 0ab56351a8
1 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -836,20 +836,24 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
svc := svcObj.(*api.Service)
glog.V(3).Infof("obtaining port information for service %v", svcKey)
for _, servicePort := range svc.Spec.Ports {
// targetPort could be a string, use the name or the port (int)
if strconv.Itoa(int(servicePort.Port)) == backendPort ||
servicePort.TargetPort.String() == backendPort ||
servicePort.Name == backendPort {
endps := ic.getEndpoints(svc, servicePort.TargetPort, api.ProtocolTCP, hz)
if len(endps) == 0 {
glog.Warningf("service %v does not have any active endpoints", svcKey)
}
sort.Sort(ingress.EndpointByAddrPort(endps))
upstreams = append(upstreams, endps...)
break
var p intstr.IntOrString
switch {
case backendPort == strconv.Itoa(int(servicePort.Port)):
p = intstr.FromInt(int(servicePort.Port))
case backendPort == servicePort.Name:
p = intstr.FromString(servicePort.Name)
default:
continue
}
endps := ic.getEndpoints(svc, p, api.ProtocolTCP, hz)
if len(endps) == 0 {
glog.Warningf("service %v does not have any active endpoints", svcKey)
}
sort.Sort(ingress.EndpointByAddrPort(endps))
upstreams = append(upstreams, endps...)
break
}
return upstreams, nil