Skip to content

Commit

Permalink
[prerelease] Prepare branch for release
Browse files Browse the repository at this point in the history
Signed-off-by: Andrew Obuchowicz <aobuchow@redhat.com>
  • Loading branch information
AObuchow committed Feb 22, 2024
1 parent 54561af commit f35f495
Show file tree
Hide file tree
Showing 9 changed files with 33 additions and 33 deletions.
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ ifndef VERBOSE
endif

export NAMESPACE ?= devworkspace-controller
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 DWO_IMG ?= quay.io/devfile/devworkspace-controller:v0.26.0
export DWO_BUNDLE_IMG ?= quay.io/devfile/devworkspace-operator-bundle:v0.26.0
export DWO_INDEX_IMG ?= quay.io/devfile/devworkspace-operator-index:release
export PROJECT_CLONE_IMG ?= quay.io/devfile/project-clone:v0.26.0
export PULL_POLICY ?= Always
export DEFAULT_ROUTING ?= basic
export KUBECONFIG ?= ${HOME}/.kube/config
Expand Down Expand Up @@ -193,7 +193,7 @@ docker-build:
### docker-push: Pushes the controller image
docker-push:
ifneq ($(INITIATOR),CI)
ifeq ($(DWO_IMG),quay.io/devfile/devworkspace-controller:next)
ifeq ($(DWO_IMG),quay.io/devfile/devworkspace-controller:v0.26.0)
@echo -n "Are you sure you want to push $(DWO_IMG)? [y/N] " && read ans && [ $${ans:-N} = y ]
endif
endif
Expand Down
8 changes: 4 additions & 4 deletions build/scripts/generate_deployment.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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:next' is used
value of 'quay.io/devfile/devworkspace-controller:v0.26.0' 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:next' is used.
'quay.io/devfile/project-clone:v0.26.0' 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
Expand Down Expand Up @@ -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:next"}
export PROJECT_CLONE_IMG=${PROJECT_CLONE_IMG:-"quay.io/devfile/project-clone:next"}
export DWO_IMG=${DEFAULT_DWO_IMG:-"quay.io/devfile/devworkspace-controller:v0.26.0"}
export PROJECT_CLONE_IMG=${PROJECT_CLONE_IMG:-"quay.io/devfile/project-clone:v0.26.0"}
export PULL_POLICY=Always
export DEFAULT_ROUTING=basic
export DEVWORKSPACE_API_VERSION=a6ec0a38307b63a29fad2eea945cc69bee97a683
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions deploy/deployment/kubernetes/combined.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions deploy/deployment/openshift/combined.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions deploy/templates/components/csv/clusterserviceversion.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package version

var (
// Version is the operator version
Version = "v0.26.0-dev"
Version = "v0.26.0"
// Commit is the commit hash corresponding to the code that was built. Can be suffixed with `-dirty`
Commit string = "unknown"
// BuildTime is the time of build of the binary
Expand Down

0 comments on commit f35f495

Please sign in to comment.