ovnkube: Intilize OVS client when runMode=node & for OVS metrics

Signed-off-by: Or Mergi <[email protected]>

Author: ormergi

go-controller/cmd/ovnkube/ovnkube.go

@@ -22,6 +22,8 @@ import (
 	"k8s.io/klog/v2"
 	kexec "k8s.io/utils/exec"
 
+	"github.com/ovn-org/libovsdb/client"
+
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/clustermanager"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/config"
 	"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/controllermanager"
@@ -521,12 +523,7 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 		}()
 	}
 
-	ovsClient, err := libovsdb.NewOVSClient(ctx.Done())
-	if err != nil {
-		cancel()
-		return fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
-	}
-
+	var ovsClient client.Client
 	if runMode.node {
 		wg.Add(1)
 		go func() {
@@ -541,14 +538,20 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 			// register ovnkube node specific prometheus metrics exported by the node
 			metrics.RegisterNodeMetrics(ctx.Done())
 
+			ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
+			if err != nil {
+				nodeErr = fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
+				return
+			}
 			nodeControllerManager, err := controllermanager.NewNodeControllerManager(
 				ovnClientset,
 				watchFactory,
 				runMode.identity,
 				wg,
 				eventRecorder,
 				routemanager.NewController(),
-				ovsClient)
+				ovsClient,
+			)
 			if err != nil {
 				nodeErr = fmt.Errorf("failed to create node network controller: %w", err)
 				return
@@ -572,6 +575,14 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
 	// Note: for ovnkube node mode dpu-host no metrics is required as ovs/ovn is not running on the node.
 	if config.OvnKubeNode.Mode != types.NodeModeDPUHost && config.Metrics.OVNMetricsBindAddress != "" {
 		metricsScrapeInterval := 30
+		defer cancel()
+
+		if ovsClient == nil {
+			ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
+			if err != nil {
+				return fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
+			}
+		}
 		if config.Metrics.ExportOVSMetrics {
 			metrics.RegisterOvsMetricsWithOvnMetrics(ovsClient, metricsScrapeInterval, ctx.Done())
 		}