Merge pull request #124 from loxilb-io/gw-run-fix

PR: Run gateway api manager only when gateway class is mentioned in args

cmd/loxilb-agent/agent.go

@@ -174,18 +174,6 @@ func run(o *Options) error {
 		}
 	}
 
-	gatewayClassManager := gatewayapi.NewGatewayClassManager(
-		k8sClient, sigsClient, networkConfig, sigsInformerFactory)
-
-	gatewayManager := gatewayapi.NewGatewayManager(
-		k8sClient, sigsClient, networkConfig, ipPool, sigsInformerFactory)
-
-	tcpRouteManager := gatewayapi.NewTCPRouteManager(
-		k8sClient, sigsClient, networkConfig, sigsInformerFactory)
-
-	udpRouteManager := gatewayapi.NewUDPRouteManager(
-		k8sClient, sigsClient, networkConfig, sigsInformerFactory)
-
 	lbManager := loadbalancer.NewLoadBalancerManager(
 		k8sClient,
 		loxilbClients,
@@ -222,13 +210,29 @@ func run(o *Options) error {
 	}()
 	log.StartLogFileNumberMonitor(stopCh)
 	informerFactory.Start(stopCh)
-	sigsInformerFactory.Start(stopCh)
 
 	go lbManager.Run(stopCh, loxiLBLiveCh, loxiLBPurgeCh, loxiLBSelMasterEvent)
-	go gatewayClassManager.Run(stopCh)
-	go gatewayManager.Run(stopCh)
-	go tcpRouteManager.Run(stopCh)
-	go udpRouteManager.Run(stopCh)
+
+	if networkConfig.LoxilbGatewayClass != "" {
+		gatewayClassManager := gatewayapi.NewGatewayClassManager(
+			k8sClient, sigsClient, networkConfig, sigsInformerFactory)
+
+		gatewayManager := gatewayapi.NewGatewayManager(
+			k8sClient, sigsClient, networkConfig, ipPool, sigsInformerFactory)
+
+		tcpRouteManager := gatewayapi.NewTCPRouteManager(
+			k8sClient, sigsClient, networkConfig, sigsInformerFactory)
+
+		udpRouteManager := gatewayapi.NewUDPRouteManager(
+			k8sClient, sigsClient, networkConfig, sigsInformerFactory)
+
+		sigsInformerFactory.Start(stopCh)
+
+		go gatewayClassManager.Run(stopCh)
+		go gatewayManager.Run(stopCh)
+		go tcpRouteManager.Run(stopCh)
+		go udpRouteManager.Run(stopCh)
+	}
 
 	<-stopCh
 

cmd/loxilb-agent/options.go

@@ -236,12 +236,11 @@ func (o *Options) setDefaults() {
 	if o.config.LoxilbLoadBalancerClass == "" {
 		o.config.LoxilbLoadBalancerClass = "loxilb.io/loxilb"
 	}
-	if o.config.LoxilbGatewayClass == "" {
-		o.config.LoxilbGatewayClass = "loxilb.io/loxilb"
-	}
+
 	if o.config.ExternalCIDR == "" {
 		o.config.ExternalCIDR = "123.123.123.1/24"
 	}
+
 	if o.config.ExternalSecondaryCIDRs == nil {
 		o.config.ExternalSecondaryCIDRs = []string{}
 	}