From 18cf49e3df4fafe541d38935778609e223a86670 Mon Sep 17 00:00:00 2001 From: wccsama Date: Tue, 15 Oct 2019 13:35:55 +0800 Subject: [PATCH] Convert error messages to use event recorder remove mix protocol validation remove check nil --- pkg/controller/service/service_controller.go | 23 ++++---------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkg/controller/service/service_controller.go b/pkg/controller/service/service_controller.go index 6a475e2efb9..9ac9477c89f 100644 --- a/pkg/controller/service/service_controller.go +++ b/pkg/controller/service/service_controller.go @@ -548,33 +548,18 @@ func (s *ServiceController) needsUpdate(oldService *v1.Service, newService *v1.S return false } -func getPortsForLB(service *v1.Service) ([]*v1.ServicePort, error) { - var protocol v1.Protocol - +func getPortsForLB(service *v1.Service) []*v1.ServicePort { ports := []*v1.ServicePort{} for i := range service.Spec.Ports { sp := &service.Spec.Ports[i] - // The check on protocol was removed here. The cloud provider itself is now responsible for all protocol validation ports = append(ports, sp) - if protocol == "" { - protocol = sp.Protocol - } else if protocol != sp.Protocol && wantsLoadBalancer(service) { - // TODO: Convert error messages to use event recorder - return nil, fmt.Errorf("mixed protocol external load balancers are not supported") - } } - return ports, nil + return ports } func portsEqualForLB(x, y *v1.Service) bool { - xPorts, err := getPortsForLB(x) - if err != nil { - return false - } - yPorts, err := getPortsForLB(y) - if err != nil { - return false - } + xPorts := getPortsForLB(x) + yPorts := getPortsForLB(y) return portSlicesEqualForLB(xPorts, yPorts) }