Sync branch with main branch to restart prerelease process

Signed-off-by: David Kwon <[email protected]>

Author: dkwon17

Makefile

@@ -22,10 +22,10 @@ ifndef VERBOSE
 endif
 
 export NAMESPACE ?= devworkspace-controller
-export DWO_IMG ?= quay.io/devfile/devworkspace-controller:v0.36.1
-export DWO_BUNDLE_IMG ?= quay.io/devfile/devworkspace-operator-bundle:v0.36.1
-export DWO_INDEX_IMG ?= quay.io/devfile/devworkspace-operator-index:release
-export PROJECT_CLONE_IMG ?= quay.io/devfile/project-clone:v0.36.1
+export DWO_IMG ?= quay.io/devfile/devworkspace-controller:next
+export DWO_BUNDLE_IMG ?= quay.io/devfile/devworkspace-operator-bundle:next
+export DWO_INDEX_IMG ?= quay.io/devfile/devworkspace-operator-index:next
+export PROJECT_CLONE_IMG ?= quay.io/devfile/project-clone:next
 export PULL_POLICY ?= Always
 export DEFAULT_ROUTING ?= basic
 export KUBECONFIG ?= ${HOME}/.kube/config
@@ -192,7 +192,7 @@ docker-build:
 ### docker-push: Pushes the controller image
 docker-push:
   ifneq ($(INITIATOR),CI)
-    ifeq ($(DWO_IMG),quay.io/devfile/devworkspace-controller:v0.36.1)
+    ifeq ($(DWO_IMG),quay.io/devfile/devworkspace-controller:next)
 	    @echo -n "Are you sure you want to push $(DWO_IMG)? [y/N] " && read ans && [ $${ans:-N} = y ]
     endif
   endif

build/scripts/generate_deployment.sh

@@ -52,12 +52,12 @@ Arguments:
       Controller (and webhook) image to use for the default deployment.
       Used only when '--use-defaults' is passed; otherwise, the value of
       the DWO_IMG environment variable is used. If unspecified, the default
-      value of 'quay.io/devfile/devworkspace-controller:v0.36.1' is used
+      value of 'quay.io/devfile/devworkspace-controller:next' is used
   --project-clone-image
       Image to use for the project clone init container. Used only when
       '--use-defaults' is passed; otherwise, the value of the PROJECT_CLONE_IMG
       environment variable is used. If unspecifed, the default value of
-      'quay.io/devfile/project-clone:v0.36.1' is used.
+      'quay.io/devfile/project-clone:next' is used.
   --split-yaml
       Parse output file combined.yaml into a yaml file for each record
       in combined yaml. Files are output to the 'objects' subdirectory
@@ -116,8 +116,8 @@ done
 if $USE_DEFAULT_ENV; then
   echo "Using defaults for environment variables"
   export NAMESPACE=devworkspace-controller
-  export DWO_IMG=${DEFAULT_DWO_IMG:-"quay.io/devfile/devworkspace-controller:v0.36.1"}
-  export PROJECT_CLONE_IMG=${PROJECT_CLONE_IMG:-"quay.io/devfile/project-clone:v0.36.1"}
+  export DWO_IMG=${DEFAULT_DWO_IMG:-"quay.io/devfile/devworkspace-controller:next"}
+  export PROJECT_CLONE_IMG=${PROJECT_CLONE_IMG:-"quay.io/devfile/project-clone:next"}
   export PULL_POLICY=Always
   export DEFAULT_ROUTING=basic
   export DEVWORKSPACE_API_VERSION=a6ec0a38307b63a29fad2eea945cc69bee97a683

deploy/bundle/manifests/devworkspace-operator.clusterserviceversion.yaml

@@ -44,5 +44,5 @@ entries:
     replaces: devworkspace-operator.v0.33.0
   - name: devworkspace-operator.v0.35.0
     replaces: devworkspace-operator.v0.34.0
-  - name: devworkspace-operator.v0.36.0
+  - name: devworkspace-operator.v0.35.1
     replaces: devworkspace-operator.v0.35.0