Skip to content

Commit 163dbd6

Browse files
committed
extraConfigDpu: Don't start vsp "manually"
With the changes in openshift/dpu-operator#128 we not longer need to start the vsp, this will be handled by the dpu operator. We will not remove the "Start" functionality, since the option to deploy the vsp manually outside the dpu operator is maintained / will be required for non-Intel vsps. Signed-off-by: Salvatore Daniele <[email protected]>
1 parent ac1251e commit 163dbd6

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

extraConfigDpu.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ def ExtraConfigDpu(cc: ClustersConfig, cfg: ExtraConfigArgs, futures: dict[str,
180180
# (the Dockerfile needs to be fixed to allow layered multi-arch build
181181
# by removing the calls to pip)
182182
vendor_plugin.build_push(acc, imgReg)
183-
vendor_plugin.start(vendor_plugin.vsp_image_name(imgReg), client)
183+
# vendor_plugin.start(vendor_plugin.vsp_image_name(imgReg), client)
184184
else:
185185
vendor_plugin.build_push_start(lh, client, imgReg)
186-
wait_vsp_ds_running(client)
186+
wait_vsp_ds_running(client)
187187

188188
git_repo_setup(repo, repo_wipe=False, url=DPU_OPERATOR_REPO)
189189
if cfg.rebuild_dpu_operators_images:
@@ -230,8 +230,11 @@ def ExtraConfigDpuHost(cc: ClustersConfig, cfg: ExtraConfigArgs, futures: dict[s
230230
h = host.Host(node.node)
231231
h.ssh_connect("core")
232232
vendor_plugin = init_vendor_plugin(h, node.kind or "")
233-
vendor_plugin.build_push_start(lh, client, imgReg)
234-
wait_vsp_ds_running(client)
233+
if isinstance(vendor_plugin, IpuPlugin):
234+
vendor_plugin.build_push(lh, imgReg)
235+
else:
236+
vendor_plugin.build_push_start(lh, client, imgReg)
237+
wait_vsp_ds_running(client)
235238

236239
git_repo_setup(repo, branch="main", repo_wipe=False, url=DPU_OPERATOR_REPO)
237240
if cfg.rebuild_dpu_operators_images:

0 commit comments

Comments
 (0)