bgp: consolidate service check and use service const (#1674)

kubeovn · Jul 8, 2022 · 761ddcb · 761ddcb
1 parent 5cffa97
commit 761ddcb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/pkg/speaker/controller.go b/pkg/speaker/controller.go
@@ -81,7 +81,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 	c.informerFactory.Start(stopCh)
 	c.kubeovnInformerFactory.Start(stopCh)
 
-	if ok := cache.WaitForCacheSync(stopCh, c.podsSynced, c.subnetSynced, c.servicesSynced); !ok {
+	if !cache.WaitForCacheSync(stopCh, c.podsSynced, c.subnetSynced, c.servicesSynced) {
 		klog.Fatalf("failed to wait for caches to sync")
 		return
 	}

diff --git a/pkg/speaker/subnet.go b/pkg/speaker/subnet.go
@@ -35,8 +35,10 @@ func isPodAlive(p *v1.Pod) bool {
 	return true
 }
 
-func isClusterIP(svc *v1.Service) bool {
-	return svc.Spec.Type == "ClusterIP"
+func isClusterIPService(svc *v1.Service) bool {
+	return svc.Spec.Type == v1.ServiceTypeClusterIP &&
+		svc.Spec.ClusterIP != v1.ClusterIPNone &&
+		len(svc.Spec.ClusterIP) != 0
 }
 
 // TODO: ipv4 only, need ipv6/dualstack support later
@@ -60,12 +62,9 @@ func (c *Controller) syncSubnetRoutes() {
 			return
 		}
 		for _, svc := range services {
-
-			if isClusterIP(svc) && svc.Annotations[util.BgpAnnotation] == "true" && svc.Spec.ClusterIP != "None" &&
-				svc.Spec.ClusterIP != "" {
+			if svc.Annotations != nil && svc.Annotations[util.BgpAnnotation] == "true" && isClusterIPService(svc) {
 				bgpExpected = append(bgpExpected, fmt.Sprintf("%s/32", svc.Spec.ClusterIP))
 			}
-
 		}
 	}