Skip to content

Commit de9a7d8

Browse files
authored
Merge pull request kubernetes#83934 from wccsama/wcc-service-dev
Convert error messages to use event recorder
2 parents 103afd2 + 18cf49e commit de9a7d8

File tree

1 file changed

+4
-19
lines changed

1 file changed

+4
-19
lines changed

pkg/controller/service/service_controller.go

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -547,33 +547,18 @@ func (s *ServiceController) needsUpdate(oldService *v1.Service, newService *v1.S
547547
return false
548548
}
549549

550-
func getPortsForLB(service *v1.Service) ([]*v1.ServicePort, error) {
551-
var protocol v1.Protocol
552-
550+
func getPortsForLB(service *v1.Service) []*v1.ServicePort {
553551
ports := []*v1.ServicePort{}
554552
for i := range service.Spec.Ports {
555553
sp := &service.Spec.Ports[i]
556-
// The check on protocol was removed here. The cloud provider itself is now responsible for all protocol validation
557554
ports = append(ports, sp)
558-
if protocol == "" {
559-
protocol = sp.Protocol
560-
} else if protocol != sp.Protocol && wantsLoadBalancer(service) {
561-
// TODO: Convert error messages to use event recorder
562-
return nil, fmt.Errorf("mixed protocol external load balancers are not supported")
563-
}
564555
}
565-
return ports, nil
556+
return ports
566557
}
567558

568559
func portsEqualForLB(x, y *v1.Service) bool {
569-
xPorts, err := getPortsForLB(x)
570-
if err != nil {
571-
return false
572-
}
573-
yPorts, err := getPortsForLB(y)
574-
if err != nil {
575-
return false
576-
}
560+
xPorts := getPortsForLB(x)
561+
yPorts := getPortsForLB(y)
577562
return portSlicesEqualForLB(xPorts, yPorts)
578563
}
579564

0 commit comments

Comments
 (0)