route controller unit tests (#264)

Author: andrewsykim

Makefile

@@ -22,7 +22,7 @@ kube-router:
 	@echo Finished kube-router binary build.
 
 test: gofmt ## Runs code quality pipelines (gofmt, tests, coverage, lint, etc)
-	go test github.com/cloudnativelabs/kube-router/utils/
+	go test github.com/cloudnativelabs/kube-router/app/... github.com/cloudnativelabs/kube-router/utils/
 
 vagrant-up: export docker=$(DOCKER)
 vagrant-up: export DEV_IMG=$(REGISTRY_DEV):$(IMG_TAG)

app/controllers/network_routes_controller.go

@@ -40,7 +40,7 @@ type NetworkRoutingController struct {
 	nodeSubnet           net.IPNet
 	nodeInterface        string
 	mu                   sync.Mutex
-	clientset            *kubernetes.Clientset
+	clientset            kubernetes.Interface
 	bgpServer            *gobgp.BgpServer
 	syncPeriod           time.Duration
 	clusterCIDR          string
@@ -227,35 +227,12 @@ func (nrc *NetworkRoutingController) Run(stopCh <-chan struct{}, wg *sync.WaitGr
 
 		// advertise cluster IP for the service to be reachable via host
 		if nrc.advertiseClusterIp {
-			glog.Infof("Advertising cluster ips of services to the external BGP peers")
-			for _, svc := range watchers.ServiceWatcher.List() {
-				if svc.Spec.Type == "ClusterIP" || svc.Spec.Type == "NodePort" || svc.Spec.Type == "LoadBalancer" {
-
-					// skip headless services
-					if svc.Spec.ClusterIP == "None" || svc.Spec.ClusterIP == "" {
-						continue
-					}
-
-					glog.Infof("found a service of cluster ip type")
-					nrc.AdvertiseClusterIp(svc.Spec.ClusterIP)
-				}
-			}
+			nrc.advertiseClusterIPs()
 		}
 
 		// advertise cluster IP for the service to be reachable via host
 		if nrc.advertiseExternalIp {
-			glog.Infof("Advertising external ips of the services to the external BGP peers")
-			for _, svc := range watchers.ServiceWatcher.List() {
-				if svc.Spec.Type == "ClusterIP" || svc.Spec.Type == "NodePort" {
-					// skip headless services
-					if svc.Spec.ClusterIP == "None" || svc.Spec.ClusterIP == "" {
-						continue
-					}
-					for _, externalIP := range svc.Spec.ExternalIPs {
-						nrc.AdvertiseClusterIp(externalIP)
-					}
-				}
-			}
+			nrc.advertiseExternalIPs()
 		}
 
 		glog.Infof("Performing periodic sync of the routes")
@@ -371,6 +348,43 @@ func (nrc *NetworkRoutingController) watchBgpUpdates() {
 	}
 }
 
+func (nrc *NetworkRoutingController) advertiseClusterIPs() {
+	glog.Infof("Advertising cluster ips of services to the external BGP peers")
+	for _, svc := range watchers.ServiceWatcher.List() {
+		if svc.Spec.Type == "ClusterIP" || svc.Spec.Type == "NodePort" || svc.Spec.Type == "LoadBalancer" {
+
+			// skip headless services
+			if svc.Spec.ClusterIP == "None" || svc.Spec.ClusterIP == "" {
+				continue
+			}
+
+			glog.Infof("found a service of cluster ip type")
+			err := nrc.AdvertiseClusterIp(svc.Spec.ClusterIP)
+			if err != nil {
+				glog.Errorf("error advertising cluster IP: %q error: %v", svc.Spec.ClusterIP, err)
+			}
+		}
+	}
+}
+
+func (nrc *NetworkRoutingController) advertiseExternalIPs() {
+	glog.Infof("Advertising external ips of the services to the external BGP peers")
+	for _, svc := range watchers.ServiceWatcher.List() {
+		if svc.Spec.Type == "ClusterIP" || svc.Spec.Type == "NodePort" {
+			// skip headless services
+			if svc.Spec.ClusterIP == "None" || svc.Spec.ClusterIP == "" {
+				continue
+			}
+			for _, externalIP := range svc.Spec.ExternalIPs {
+				err := nrc.AdvertiseClusterIp(externalIP)
+				if err != nil {
+					glog.Errorf("error advertising external IP: %q, error: %v", externalIP, err)
+				}
+			}
+		}
+	}
+}
+
 func (nrc *NetworkRoutingController) advertiseRoute() error {
 	cidr, err := utils.GetPodCidrFromNodeSpec(nrc.clientset, nrc.hostnameOverride)
 	if err != nil {