fixup! fixup! Finalize workspace to DevWorkspace renaming

Author: sleshchenko

Makefile

@@ -24,7 +24,7 @@ export PULL_POLICY ?= Always
 export DEFAULT_ROUTING ?= basic
 export KUBECONFIG ?= ${HOME}/.kube/config
 #TODO Revert before merge
-export DEVWORKSPACE_API_VERSION ?= 68e5c13fb8f3623cc11d7203c93c5387cf758112
+export DEVWORKSPACE_API_VERSION ?= 8eec3a46767c284d50aaf866cc58caafa4e021e3
 
 #internal params
 DEVWORKSPACE_CTRL_SA=devworkspace-controller-serviceaccount

deploy/generate-deployment.sh

@@ -84,7 +84,7 @@ if $USE_DEFAULT_ENV; then
   export DWO_IMG=${DEFAULT_IMAGE:-"quay.io/devfile/devworkspace-controller:next"}
   export PULL_POLICY=Always
   export DEFAULT_ROUTING=basic
-  export DEVWORKSPACE_API_VERSION=68e5c13fb8f3623cc11d7203c93c5387cf758112
+  export DEVWORKSPACE_API_VERSION=8eec3a46767c284d50aaf866cc58caafa4e021e3
   export ROUTING_SUFFIX=""
   export FORCE_DEVWORKSPACE_CRDS_UPDATE=true
 fi

go.mod

@@ -29,4 +29,4 @@ require (
 	sigs.k8s.io/yaml v1.2.0
 )
 
-replace github.com/devfile/api/v2 v2.0.0-20210212161736-283b0c54946e => github.com/sleshchenko/devfile-api/v2 v2.0.0-20210331150507-68e5c13fb8f3 //TODO Remove before merge
+replace github.com/devfile/api/v2 v2.0.0-20210212161736-283b0c54946e => github.com/sleshchenko/devfile-api/v2 v2.0.0-20210401154055-8eec3a46767c //TODO Remove before merge

go.sum

@@ -293,8 +293,8 @@ github.com/santhosh-tekuri/jsonschema v1.2.4/go.mod h1:TEAUOeZSmIxTTuHatJzrvARHi
 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/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE=
-github.com/sleshchenko/devfile-api/v2 v2.0.0-20210331150507-68e5c13fb8f3 h1:yzgk6Z5DOinKxszGMd/eqABpG8rV7+E19kgWHnJR9fo=
-github.com/sleshchenko/devfile-api/v2 v2.0.0-20210331150507-68e5c13fb8f3/go.mod h1:Cot4snybn3qhIh48oIFi9McocnIx7zY5fFbjfrIpPvg=
+github.com/sleshchenko/devfile-api/v2 v2.0.0-20210401154055-8eec3a46767c h1:CrI676KzFNPVl9on21SKqSsK9E66+NN30fpu+3DuKNU=
+github.com/sleshchenko/devfile-api/v2 v2.0.0-20210401154055-8eec3a46767c/go.mod h1:Cot4snybn3qhIh48oIFi9McocnIx7zY5fFbjfrIpPvg=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=

update_devworkspace_crds.sh

@@ -42,6 +42,7 @@ echo "Downloading devfile/api CRDs to $TMP_DIR"
 
 cd $TMP_DIR
 git init
+# TODO REVERT BEFORE MERGING
 git remote add origin https://github.com/sleshchenko/devfile-api.git
 git config core.sparsecheckout true
 echo "crds/*" > .git/info/sparse-checkout