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

Merge pull request #846 from justinsb/serviceport

Browse source 
Match ServicePort to Endpoints by Name
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-06-12 23:58:49 -04:00 committed by GitHub
commit e258ee19d1
1 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -489,7 +489,7 @@ func (ic *GenericController) getStreamServices(configmapName string, proto api.P
glog.V(3).Infof("searching service %v/%v endpoints using the name '%v'", svcNs, svcName, svcPort) glog.V(3).Infof("searching service %v/%v endpoints using the name '%v'", svcNs, svcName, svcPort)
for _, sp := range svc.Spec.Ports { for _, sp := range svc.Spec.Ports {
if sp.Name == svcPort { if sp.Name == svcPort {
endps = ic.getEndpoints(svc, sp.TargetPort, proto, &healthcheck.Upstream{}) endps = ic.getEndpoints(svc, &sp, proto, &healthcheck.Upstream{})
break break
} }
} }
@ -498,7 +498,7 @@ func (ic *GenericController) getStreamServices(configmapName string, proto api.P
glog.V(3).Infof("searching service %v/%v endpoints using the target port '%v'", svcNs, svcName, targetPort) glog.V(3).Infof("searching service %v/%v endpoints using the target port '%v'", svcNs, svcName, targetPort)
for _, sp := range svc.Spec.Ports { for _, sp := range svc.Spec.Ports {
if sp.Port == int32(targetPort) { if sp.Port == int32(targetPort) {
endps = ic.getEndpoints(svc, sp.TargetPort, proto, &healthcheck.Upstream{}) endps = ic.getEndpoints(svc, &sp, proto, &healthcheck.Upstream{})
break break
} }
} }
@ -548,7 +548,7 @@ func (ic *GenericController) getDefaultUpstream() *ingress.Backend {
} }
svc := svcObj.(*api.Service) svc := svcObj.(*api.Service)
endps := ic.getEndpoints(svc, svc.Spec.Ports[0].TargetPort, api.ProtocolTCP, &healthcheck.Upstream{}) endps := ic.getEndpoints(svc, &svc.Spec.Ports[0], api.ProtocolTCP, &healthcheck.Upstream{})
if len(endps) == 0 { if len(endps) == 0 {
glog.Warningf("service %v does not have any active endpoints", svcKey) glog.Warningf("service %v does not have any active endpoints", svcKey)
endps = []ingress.Endpoint{newDefaultServer()} endps = []ingress.Endpoint{newDefaultServer()}
@ -841,7 +841,7 @@ func (ic *GenericController) serviceEndpoints(svcKey, backendPort string,
servicePort.TargetPort.String() == backendPort || servicePort.TargetPort.String() == backendPort ||
servicePort.Name == backendPort { servicePort.Name == backendPort {
endps := ic.getEndpoints(svc, servicePort.TargetPort, api.ProtocolTCP, hz) endps := ic.getEndpoints(svc, &servicePort, api.ProtocolTCP, hz)
if len(endps) == 0 { if len(endps) == 0 {
glog.Warningf("service %v does not have any active endpoints", svcKey) glog.Warningf("service %v does not have any active endpoints", svcKey)
} }
@ -1026,7 +1026,7 @@ func (ic *GenericController) createServers(data []interface{},
// getEndpoints returns a list of <endpoint ip>:<port> for a given service/target port combination. // getEndpoints returns a list of <endpoint ip>:<port> for a given service/target port combination.
func (ic *GenericController) getEndpoints( func (ic *GenericController) getEndpoints(
s *api.Service, s *api.Service,
servicePort intstr.IntOrString, servicePort *api.ServicePort,
proto api.Protocol, proto api.Protocol,
hz *healthcheck.Upstream) []ingress.Endpoint { hz *healthcheck.Upstream) []ingress.Endpoint {
@ -1039,7 +1039,7 @@ func (ic *GenericController) getEndpoints(
// ExternalName services // ExternalName services
if s.Spec.Type == api.ServiceTypeExternalName { if s.Spec.Type == api.ServiceTypeExternalName {
targetPort := servicePort.IntValue() targetPort := servicePort.TargetPort.IntValue()
// check for invalid port value // check for invalid port value
if targetPort <= 0 { if targetPort <= 0 {
return upsServers return upsServers
@ -1069,15 +1069,11 @@ func (ic *GenericController) getEndpoints(
var targetPort int32 var targetPort int32
switch servicePort.Type { if servicePort.Name == "" {
case intstr.Int: // ServicePort.Name is optional if there is only one port
if int(epPort.Port) == servicePort.IntValue() { targetPort = epPort.Port
targetPort = epPort.Port } else if servicePort.Name == epPort.Name {
} targetPort = epPort.Port
case intstr.String:
if epPort.Name == servicePort.StrVal {
targetPort = epPort.Port
}
} }
// check for invalid port value // check for invalid port value