Update to devfile/api commit 283b0c54946e9fea9872c25e1e086c303688f0e8

amisevsk · amisevsk · commit 9da0e4832d06 · 2021-02-22T16:54:07.000-05:00
* Update Makefile to point at latest devfile/api commit and support v2 * Update to devfile/api commit f33d2987d137225cd1e8975f6fdfdd2663195a37 * Adapt code to support new module name (.../v2) (see: devfile/api#280) Signed-off-by: Angel Misevski <amisevsk@redhat.com>
diff --git a/Makefile b/Makefile
@@ -23,7 +23,7 @@ export ROUTING_SUFFIX ?= 192.168.99.100.nip.io
 export PULL_POLICY ?= Always
 export DEFAULT_ROUTING ?= basic
 export KUBECONFIG ?= ${HOME}/.kube/config
-export DEVWORKSPACE_API_VERSION ?= aeda60d4361911da85103f224644bfa792498499
+export DEVWORKSPACE_API_VERSION ?= 283b0c54946e9fea9872c25e1e086c303688f0e8
 
 #internal params
 DEVWORKSPACE_CTRL_SA=devworkspace-controller-serviceaccount
@@ -110,7 +110,7 @@ endif
 ##### Rules for dealing with devfile/api
 ### update_devworkspace_api: update version of devworkspace crds in go.mod
 update_devworkspace_api:
-	go mod edit --require github.com/devfile/api@$(DEVWORKSPACE_API_VERSION)
+	go mod edit --require github.com/devfile/api/v2@$(DEVWORKSPACE_API_VERSION)
 	go mod download
 	go mod tidy
 
diff --git a/apis/controller/v1alpha1/component.go b/apis/controller/v1alpha1/component.go
@@ -13,7 +13,7 @@
 package v1alpha1
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
 // Description of a devfile component's workspace additions
diff --git a/apis/controller/v1alpha1/component_types.go b/apis/controller/v1alpha1/component_types.go
@@ -13,7 +13,7 @@
 package v1alpha1
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/apis/controller/v1alpha1/workspacerouting_types.go b/apis/controller/v1alpha1/workspacerouting_types.go
@@ -13,7 +13,7 @@
 package v1alpha1
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/apis/controller/v1alpha1/zz_generated.deepcopy.go b/apis/controller/v1alpha1/zz_generated.deepcopy.go
diff --git a/controllers/controller/workspacerouting/solvers/cluster_solver.go b/controllers/controller/workspacerouting/solvers/cluster_solver.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/devfile/devworkspace-operator/pkg/common"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	corev1 "k8s.io/api/core/v1"
diff --git a/controllers/controller/workspacerouting/solvers/common.go b/controllers/controller/workspacerouting/solvers/common.go
@@ -13,8 +13,8 @@
 package solvers
 
 import (
-	"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/devfile/devworkspace-operator/pkg/config"
diff --git a/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go b/controllers/controller/workspacerouting/solvers/openshift_oauth_solver.go
@@ -18,7 +18,7 @@ import (
 	maputils "github.com/devfile/devworkspace-operator/internal/map"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/devfile/devworkspace-operator/pkg/config"
diff --git a/controllers/controller/workspacerouting/solvers/resolve_endpoints.go b/controllers/controller/workspacerouting/solvers/resolve_endpoints.go
@@ -17,7 +17,7 @@ import (
 	"net/url"
 	"strings"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 )
diff --git a/controllers/workspace/devworkspace_controller.go b/controllers/workspace/devworkspace_controller.go
@@ -45,7 +45,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
 type currentStatus struct {
diff --git a/controllers/workspace/finalize.go b/controllers/workspace/finalize.go
@@ -20,7 +20,7 @@ import (
 
 	storagelib "github.com/devfile/devworkspace-operator/pkg/library/storage"
 
-	"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
 	"github.com/devfile/devworkspace-operator/internal/images"
 	"github.com/devfile/devworkspace-operator/pkg/common"
diff --git a/controllers/workspace/predicates.go b/controllers/workspace/predicates.go
@@ -13,7 +13,7 @@
 package controllers
 
 import (
-	"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"k8s.io/apimachinery/pkg/api/equality"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/predicate"
diff --git a/controllers/workspace/provision/deployment.go b/controllers/workspace/provision/deployment.go
@@ -22,7 +22,7 @@ import (
 
 	"github.com/devfile/devworkspace-operator/pkg/common"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/controllers/workspace/env"
 	"github.com/devfile/devworkspace-operator/pkg/config"
diff --git a/controllers/workspace/provision/pvc.go b/controllers/workspace/provision/pvc.go
@@ -13,7 +13,7 @@
 package provision
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
diff --git a/controllers/workspace/provision/rbac.go b/controllers/workspace/provision/rbac.go
@@ -13,7 +13,7 @@
 package provision
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/go-logr/logr"
 	rbacv1 "k8s.io/api/rbac/v1"
diff --git a/controllers/workspace/provision/routing.go b/controllers/workspace/provision/routing.go
@@ -17,7 +17,7 @@ import (
 	"fmt"
 	"strings"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	maputils "github.com/devfile/devworkspace-operator/internal/map"
 	"github.com/devfile/devworkspace-operator/pkg/config"
diff --git a/controllers/workspace/provision/serviceaccount.go b/controllers/workspace/provision/serviceaccount.go
@@ -15,7 +15,7 @@ package provision
 import (
 	"context"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
diff --git a/controllers/workspace/restapis/component.go b/controllers/workspace/restapis/component.go
@@ -15,7 +15,7 @@ package restapis
 import (
 	"strings"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/common"
 	"github.com/devfile/devworkspace-operator/pkg/config"
diff --git a/controllers/workspace/restapis/configmap.go b/controllers/workspace/restapis/configmap.go
@@ -16,7 +16,7 @@ import (
 	"context"
 	"encoding/json"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
 	"github.com/devfile/devworkspace-operator/pkg/common"
diff --git a/controllers/workspace/restapis/devfilev1.go b/controllers/workspace/restapis/devfilev1.go
@@ -17,7 +17,7 @@ import (
 	"path"
 	"strings"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	workspaceApi "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 )
diff --git a/controllers/workspace/status.go b/controllers/workspace/status.go
@@ -23,7 +23,7 @@ import (
 
 	"github.com/go-logr/logr"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/controllers/workspace/provision"
 	corev1 "k8s.io/api/core/v1"
diff --git a/controllers/workspace/validation.go b/controllers/workspace/validation.go
@@ -15,7 +15,7 @@ package controllers
 import (
 	"fmt"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/devfile/devworkspace-operator/pkg/webhook"
 )
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/devfile/devworkspace-operator
 go 1.13
 
 require (
-	github.com/devfile/api v0.0.0-20201125082321-aeda60d43619
+	github.com/devfile/api/v2 v2.0.0-20210212161736-283b0c54946e
 	github.com/go-logr/logr v0.1.0
 	github.com/google/go-cmp v0.5.0
 	github.com/google/uuid v1.1.1
diff --git a/go.sum b/go.sum
@@ -49,8 +49,8 @@ github.com/davecgh/go-spew v0.0.0-20151105211317-5215b55f46b2/go.mod h1:J7Y8YcW2
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/devfile/api v0.0.0-20201125082321-aeda60d43619 h1:1pTtDONDby55+kqHhvSqPiVKIGf1OJRY1vXCeHFG+wU=
-github.com/devfile/api v0.0.0-20201125082321-aeda60d43619/go.mod h1:/aDiwWjDEW/fY1/Ig8umVtmneAXKZImnLvWqzMlcfrY=
+github.com/devfile/api/v2 v2.0.0-20210212161736-283b0c54946e h1:BZ2yGqLeup9dugsYQMWhhyb525TPQr5Krq+nzBj09X0=
+github.com/devfile/api/v2 v2.0.0-20210212161736-283b0c54946e/go.mod h1:Cot4snybn3qhIh48oIFi9McocnIx7zY5fFbjfrIpPvg=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/docker/docker v0.7.3-0.20190327010347-be7ac8be2ae0/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
@@ -298,6 +298,7 @@ github.com/remyoudompheng/bigfft v0.0.0-20170806203942-52369c62f446/go.mod h1:uY
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g=
+github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHiuO9LYd+cIxzgEHCQI4=
 github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.4.2 h1:SPIRibHv4MatM3XXNO2BJeFLZwZ2LvZgfQ5+UNI2im4=
diff --git a/internal/images/image.go b/internal/images/image.go
@@ -25,7 +25,7 @@ import (
 	"os"
 	"regexp"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
diff --git a/main.go b/main.go
@@ -23,8 +23,8 @@ import (
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/devfile/devworkspace-operator/pkg/webhook"
 
-	workspacev1alpha1 "github.com/devfile/api/pkg/apis/workspaces/v1alpha1"
-	workspacev1alpha2 "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	workspacev1alpha1 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha1"
+	workspacev1alpha2 "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	workspacecontroller "github.com/devfile/devworkspace-operator/controllers/workspace"
 
diff --git a/pkg/config/cmd_terminal.go b/pkg/config/cmd_terminal.go
@@ -17,7 +17,7 @@ import (
 
 	"github.com/devfile/devworkspace-operator/internal/images"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 
 	"sigs.k8s.io/yaml"
 )
diff --git a/pkg/library/container/container.go b/pkg/library/container/container.go
@@ -17,14 +17,14 @@
 // - Devfile API spec is unclear on how mountSources should be handled -- mountPath is assumed to be /projects
 //   and volume name is assumed to be "projects"
 //   see issues:
-//     - https://github.com/devfile/api/issues/290
-//     - https://github.com/devfile/api/issues/291
+//     - https://github.com/devfile/api/v2/issues/290
+//     - https://github.com/devfile/api/v2/issues/291
 package container
 
 import (
 	"fmt"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/library/flatten"
 	"github.com/devfile/devworkspace-operator/pkg/library/lifecycle"
diff --git a/pkg/library/container/container_test.go b/pkg/library/container/container_test.go
@@ -21,7 +21,7 @@ import (
 	"github.com/google/go-cmp/cmp"
 	corev1 "k8s.io/api/core/v1"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/stretchr/testify/assert"
diff --git a/pkg/library/container/conversion.go b/pkg/library/container/conversion.go
@@ -15,7 +15,7 @@ package container
 import (
 	"fmt"
 
-	"github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
diff --git a/pkg/library/container/mountSources.go b/pkg/library/container/mountSources.go
@@ -13,7 +13,7 @@
 package container
 
 import (
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/pkg/config"
 	"github.com/devfile/devworkspace-operator/pkg/library/constants"
 	corev1 "k8s.io/api/core/v1"
@@ -43,7 +43,7 @@ func handleMountSources(k8sContainer *corev1.Container, devfileContainer *devwor
 	var sourceMapping string
 	if vm := getProjectsVolumeMount(k8sContainer); vm != nil {
 		// Container already mounts projects volume; need to set env vars according to mountPath
-		// TODO: see issue https://github.com/devfile/api/issues/290
+		// TODO: see issue https://github.com/devfile/api/v2/issues/290
 		sourceMapping = vm.MountPath
 	} else {
 		sourceMapping = devfileContainer.SourceMapping
diff --git a/pkg/library/flatten/common.go b/pkg/library/flatten/common.go
@@ -12,7 +12,7 @@
 
 package flatten
 
-import devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+import devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 
 func DevWorkspaceIsFlattened(devworkspace devworkspace.DevWorkspaceTemplateSpec) bool {
 	if devworkspace.Parent != nil {
diff --git a/pkg/library/flatten/flatten.go b/pkg/library/flatten/flatten.go
@@ -20,8 +20,8 @@ import (
 
 	registry "github.com/devfile/devworkspace-operator/pkg/library/flatten/internal_registry"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
-	"github.com/devfile/api/pkg/utils/overriding"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
+	"github.com/devfile/api/v2/pkg/utils/overriding"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -34,7 +34,7 @@ type ResolverTools struct {
 	InternalRegistry  registry.InternalRegistry
 }
 
-// TODO: temp workaround for panic in devfile/api when using plugin overrides. See: https://github.com/devfile/api/issues/296
+// TODO: temp workaround for panic in devfile/api when using plugin overrides. See: https://github.com/devfile/api/v2/issues/296
 type tempOverrides struct {
 	devworkspace.PluginOverrides
 }
@@ -107,7 +107,7 @@ func recursiveResolve(workspace devworkspace.DevWorkspaceTemplateSpec, tooling R
 	}
 
 	// TODO: Temp workaround for issue in devfile API: can't pass in nil for parentFlattenedContent
-	// see: https://github.com/devfile/api/issues/295
+	// see: https://github.com/devfile/api/v2/issues/295
 	resolvedContent, err := overriding.MergeDevWorkspaceTemplateSpec(resolvedContent, &devworkspace.DevWorkspaceTemplateSpecContent{}, pluginSpecContents...)
 	if err != nil {
 		return nil, fmt.Errorf("failed to merge DevWorkspace parents/plugins: %w", err)
@@ -142,7 +142,7 @@ func resolvePluginComponent(
 	}
 
 	if plugin.Components != nil || plugin.Commands != nil {
-		// TODO: temp workaround for panic in devfile/api when using plugin overrides. See: https://github.com/devfile/api/issues/296
+		// TODO: temp workaround for panic in devfile/api when using plugin overrides. See: https://github.com/devfile/api/v2/issues/296
 		//overrideSpec, err := overriding.OverrideDevWorkspaceTemplateSpec(&resolvedPlugin.DevWorkspaceTemplateSpecContent, devworkspace.PluginOverrides{
 		//	Components: plugin.Components,
 		//	Commands:   plugin.Commands,
diff --git a/pkg/library/flatten/flatten_test.go b/pkg/library/flatten/flatten_test.go
@@ -33,7 +33,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/yaml"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
 var workspaceTemplateDiffOpts = cmp.Options{
diff --git a/pkg/library/flatten/helper.go b/pkg/library/flatten/helper.go
@@ -16,7 +16,7 @@ import (
 	"fmt"
 	"reflect"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 )
 
 // resolutionContextTree is a recursive structure representing information about the devworkspace that is
diff --git a/pkg/library/flatten/internal_registry/registry.go b/pkg/library/flatten/internal_registry/registry.go
@@ -18,7 +18,7 @@ import (
 	"os"
 	"path/filepath"
 
-	devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"
+	devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"
 	"github.com/devfile/devworkspace-operator/internal/images"
 	"sigs.k8s.io/yaml"
 
diff --git a/pkg/library/flatten/web_terminal/web_terminal.go b/pkg/library/flatten/web_terminal/web_terminal.go
diff --git a/pkg/library/lifecycle/command.go b/pkg/library/lifecycle/command.go
diff --git a/pkg/library/lifecycle/lifecycle.go b/pkg/library/lifecycle/lifecycle.go
diff --git a/pkg/library/lifecycle/lifecycle_test.go b/pkg/library/lifecycle/lifecycle_test.go
diff --git a/pkg/library/shim/component.go b/pkg/library/shim/component.go
diff --git a/pkg/library/storage/commonStorage.go b/pkg/library/storage/commonStorage.go
diff --git a/pkg/library/storage/commonStorage_test.go b/pkg/library/storage/commonStorage_test.go
diff --git a/pkg/timing/annotations.go b/pkg/timing/annotations.go
diff --git a/pkg/timing/timing.go b/pkg/timing/timing.go
diff --git a/test/e2e/pkg/client/client.go b/test/e2e/pkg/client/client.go
diff --git a/test/e2e/pkg/client/devws.go b/test/e2e/pkg/client/devws.go
diff --git a/test/e2e/pkg/tests/devworkspaces_tests.go b/test/e2e/pkg/tests/devworkspaces_tests.go
diff --git a/webhook/main.go b/webhook/main.go
diff --git a/webhook/workspace/handler/immutable.go b/webhook/workspace/handler/immutable.go
diff --git a/webhook/workspace/handler/workspace.go b/webhook/workspace/handler/workspace.go

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@`
`13`	`13`	`package v1alpha1`
`14`	`14`
`15`	`15`	`import (`
`16`		`- devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"`
	`16`	`+ devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"`
`17`	`17`	`)`
`18`	`18`
`19`	`19`	`// Description of a devfile component's workspace additions`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ import (`
`17`	`17`	`"net/url"`
`18`	`18`	`"strings"`
`19`	`19`
`20`		`- devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"`
	`20`	`+ devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"`
`21`	`21`	`controllerv1alpha1 "github.com/devfile/devworkspace-operator/apis/controller/v1alpha1"`
`22`	`22`	`"github.com/devfile/devworkspace-operator/pkg/config"`
`23`	`23`	`)`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ import (`
`45`	`45`	`"sigs.k8s.io/controller-runtime/pkg/client"`
`46`	`46`	`"sigs.k8s.io/controller-runtime/pkg/reconcile"`
`47`	`47`
`48`		`- devworkspace "github.com/devfile/api/pkg/apis/workspaces/v1alpha2"`
	`48`	`+ devworkspace "github.com/devfile/api/v2/pkg/apis/workspaces/v1alpha2"`
`49`	`49`	`)`
`50`	`50`
`51`	`51`	`type currentStatus struct {`