diff --git a/controllers/gce/controller/controller_test.go b/controllers/gce/controller/controller_test.go index d752b2a73..34d98b2d0 100644 --- a/controllers/gce/controller/controller_test.go +++ b/controllers/gce/controller/controller_test.go @@ -184,11 +184,11 @@ func addIngress(lbc *LoadBalancerController, ing *extensions.Ingress, pm *nodePo var svcPort api.ServicePort switch path.Backend.ServicePort.Type { case intstr.Int: - svcPort = api.ServicePort{Port: int(path.Backend.ServicePort.IntVal)} + svcPort = api.ServicePort{Port: path.Backend.ServicePort.IntVal} default: svcPort = api.ServicePort{Name: path.Backend.ServicePort.StrVal} } - svcPort.NodePort = pm.getNodePort(path.Backend.ServiceName) + svcPort.NodePort = int32(pm.getNodePort(path.Backend.ServiceName)) svc.Spec.Ports = []api.ServicePort{svcPort} lbc.svcLister.Store.Add(svc) } diff --git a/controllers/gce/controller/utils.go b/controllers/gce/controller/utils.go index ec8d019ea..50a3bb846 100644 --- a/controllers/gce/controller/utils.go +++ b/controllers/gce/controller/utils.go @@ -267,13 +267,13 @@ func (t *GCETranslator) getServiceNodePort(be extensions.IngressBackend, namespa for _, p := range obj.(*api.Service).Spec.Ports { switch be.ServicePort.Type { case intstr.Int: - if p.Port == int(be.ServicePort.IntVal) { - nodePort = p.NodePort + if p.Port == be.ServicePort.IntVal { + nodePort = int(p.NodePort) break } default: if p.Name == be.ServicePort.StrVal { - nodePort = p.NodePort + nodePort = int(p.NodePort) break } } diff --git a/controllers/nginx/controller.go b/controllers/nginx/controller.go index f2cb6173f..4e4293060 100644 --- a/controllers/nginx/controller.go +++ b/controllers/nginx/controller.go @@ -496,7 +496,7 @@ func (lbc *loadBalancerController) getStreamServices(data map[string]string, pro } else { // we need to use the TargetPort (where the endpoints are running) for _, sp := range svc.Spec.Ports { - if sp.Port == targetPort { + if sp.Port == int32(targetPort) { endps = lbc.getEndpoints(svc, sp.TargetPort, proto) break } @@ -692,7 +692,7 @@ func (lbc *loadBalancerController) createUpstreams(data []interface{}) map[strin bp := path.Backend.ServicePort.String() for _, servicePort := range svc.Spec.Ports { // targetPort could be a string, use the name or the port (int) - if strconv.Itoa(servicePort.Port) == bp || servicePort.TargetPort.String() == bp || servicePort.Name == bp { + if strconv.Itoa(int(servicePort.Port)) == bp || servicePort.TargetPort.String() == bp || servicePort.Name == bp { endps := lbc.getEndpoints(svc, servicePort.TargetPort, api.ProtocolTCP) if len(endps) == 0 { glog.Warningf("service %v does no have any active endpoints", svcKey) @@ -822,10 +822,10 @@ func (lbc *loadBalancerController) getEndpoints(s *api.Service, servicePort ints continue } - var targetPort int + var targetPort int32 switch servicePort.Type { case intstr.Int: - if epPort.Port == servicePort.IntValue() { + if int(epPort.Port) == servicePort.IntValue() { targetPort = epPort.Port } case intstr.String: @@ -838,7 +838,7 @@ func (lbc *loadBalancerController) getEndpoints(s *api.Service, servicePort ints continue } - targetPort = port + targetPort = int32(port) } else { newnp, err := lbc.checkSvcForUpdate(s) if err != nil { @@ -853,7 +853,7 @@ func (lbc *loadBalancerController) getEndpoints(s *api.Service, servicePort ints continue } - targetPort = port + targetPort = int32(port) } } }