From 03fa9adf6bfffe173b5e46623fa949c675e9d1e8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 11 Nov 2022 17:15:13 +0100 Subject: [PATCH] Prepare Release - v1.6.0 (#140) --- .VERSION | 2 +- CHANGELOG.md | 16 ++++++++++++++++ Makefile | 8 ++++++++ version/version.go | 2 +- 4 files changed, 26 insertions(+), 2 deletions(-) diff --git a/.VERSION b/.VERSION index 3e1ad72..ce6a70b 100644 --- a/.VERSION +++ b/.VERSION @@ -1 +1 @@ -1.5.0 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 614d973..36ae0cb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,22 @@ --- +[//]: # (START/v1.6.0) +# v1.6.0 + +This version of the operator highlights the migration of the operator +to use the latest version of the `operator-sdk` (`1.25.0` at the time of this release). + +For the users, this shouldn't affect the functionality of the operator. + +This migration enables us to use the new project structure, as well as updated packages that enables +the team (as well as the contributors) to develop the operator more effective. + +## Features + * Migrate the operator to use the latest `operator-sdk` {#124} + +--- + [//]: # (START/v1.5.0) # v1.5.0 diff --git a/Makefile b/Makefile index ec0569f..6e28067 100644 --- a/Makefile +++ b/Makefile @@ -1,3 +1,5 @@ +export MAIN_BRANCH ?= main + # VERSION defines the project version for the bundle. # Update this value when you upgrade the version of your project. # To re-generate a bundle for another specific version without changing the standard setup, you can: @@ -259,6 +261,12 @@ catalog-push: ## Push a catalog image. $(MAKE) docker-push IMG=$(CATALOG_IMG) ## Release functions ===================== +GIT_BRANCH := $(shell git symbolic-ref --short HEAD) +WORKTREE_CLEAN := $(shell git status --porcelain 1>/dev/null 2>&1; echo $$?) +SCRIPTS_DIR := $(CURDIR)/scripts + +versionFile = $(CURDIR)/.VERSION +curVersion := $(shell cat $(versionFile) | sed 's/^v//') release/prepare: .check_git_clean ## Updates changelog and creates release branch (call with 'release/prepare version=') diff --git a/version/version.go b/version/version.go index ec3a236..312046a 100644 --- a/version/version.go +++ b/version/version.go @@ -1,6 +1,6 @@ package version var ( - OperatorVersion = "1.5.0" + OperatorVersion = "1.6.0" OperatorSDKVersion = "1.25.0" )