Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions controllers/workspace/devworkspace_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import (
"strings"
"time"

devfilevalidation "github.com/devfile/api/v2/pkg/validation"
controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
"github.com/devfile/devworkspace-operator/controllers/workspace/metrics"
"github.com/devfile/devworkspace-operator/pkg/common"
Expand Down Expand Up @@ -253,13 +252,14 @@ func (r *DevWorkspaceReconciler) Reconcile(ctx context.Context, req ctrl.Request
reconcileStatus.setConditionTrue(conditions.DevWorkspaceResolved, "Resolved plugins and parents from DevWorkspace")

// Verify that the devworkspace components are valid after flattening
components := workspace.Spec.Template.Components
if components != nil {
eventErrors := devfilevalidation.ValidateComponents(components)
if eventErrors != nil {
return r.failWorkspace(workspace, eventErrors.Error(), metrics.ReasonBadRequest, reqLogger, &reconcileStatus)
}
}
// TODO: Disable validation until https://github.com/devfile/api/issues/821 is resolved and pulled into this repo
// components := workspace.Spec.Template.Components
// if components != nil {
// eventErrors := devfilevalidation.ValidateComponents(components)
// if eventErrors != nil {
// return r.failWorkspace(workspace, eventErrors.Error(), metrics.ReasonBadRequest, reqLogger, &reconcileStatus)
// }
// }

storageProvisioner, err := storage.GetProvisioner(workspace)
if err != nil {
Expand Down