Skip to content

Commit 4dcedbe

Browse files
crnithyajcaamano
authored andcommitted
ovs client shouldn't be initialized on DPU Hosts
Signed-off-by: nithyar <[email protected]>
1 parent aa2557a commit 4dcedbe

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

go-controller/cmd/ovnkube/ovnkube.go

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -538,11 +538,15 @@ func runOvnKube(ctx context.Context, runMode *ovnkubeRunMode, ovnClientset *util
538538
// register ovnkube node specific prometheus metrics exported by the node
539539
metrics.RegisterNodeMetrics(ctx.Done())
540540

541-
ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
542-
if err != nil {
543-
nodeErr = fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
544-
return
541+
// OVS is not running on dpu-host nodes
542+
if config.OvnKubeNode.Mode != types.NodeModeDPUHost {
543+
ovsClient, err = libovsdb.NewOVSClient(ctx.Done())
544+
if err != nil {
545+
nodeErr = fmt.Errorf("failed to initialize libovsdb vswitchd client: %w", err)
546+
return
547+
}
545548
}
549+
546550
nodeControllerManager, err := controllermanager.NewNodeControllerManager(
547551
ovnClientset,
548552
watchFactory,

go-controller/pkg/cni/cni.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,12 @@ func (pr *PodRequest) cmdAddWithGetCNIResultFunc(
182182
if pr.CNIConf.PhysicalNetworkName != "" {
183183
netName = pr.CNIConf.PhysicalNetworkName
184184
}
185-
if err := checkBridgeMapping(ovsClient, pr.CNIConf.Topology, netName); err != nil {
186-
return nil, fmt.Errorf("failed bridge mapping validation: %w", err)
185+
186+
// Skip checking bridge mapping on DPU hosts as OVS is not present
187+
if config.OvnKubeNode.Mode != types.NodeModeDPUHost {
188+
if err := checkBridgeMapping(ovsClient, pr.CNIConf.Topology, netName); err != nil {
189+
return nil, fmt.Errorf("failed bridge mapping validation: %w", err)
190+
}
187191
}
188192

189193
response.Result, err = getCNIResultFn(pr, clientset, podInterfaceInfo)

0 commit comments

Comments
 (0)