Skip to content

Commit dc9845a

Browse files
committed
fix: auto-mount path collisions
Signed-off-by: Oleksii Kurinnyi <[email protected]>
1 parent a6ec0bf commit dc9845a

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

controllers/workspace/devworkspace_controller.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -371,7 +371,9 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
371371
}
372372

373373
// Add automount resources into devfile containers
374-
err = automount.ProvisionAutoMountResourcesInto(devfilePodAdditions, clusterAPI, workspace.Namespace, home.PersistUserHomeEnabled(workspace))
374+
if err := automount.ProvisionAutoMountResourcesInto(devfilePodAdditions, clusterAPI, workspace.Namespace, home.PersistUserHomeEnabled(workspace)); err != nil {
375+
return r.failWorkspace(workspace, fmt.Sprintf("Failed to mount automount resources to workspace: %s", err), metrics.ReasonWorkspaceEngineFailure, reqLogger, &reconcileStatus), nil
376+
}
375377
if shouldReturn, reconcileResult, reconcileErr := r.checkDWError(workspace, err, "Failed to process automount resources", metrics.ReasonBadRequest, reqLogger, &reconcileStatus); shouldReturn {
376378
return reconcileResult, reconcileErr
377379
}

0 commit comments

Comments
 (0)