Improve release scripts for patch releases

Author: burmanm

Makefile

@@ -4,7 +4,7 @@
 # - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
 # - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
 
-VERSION ?= 1.23.0
+VERSION ?= 1.22.4
 
 COMMIT := $(shell git rev-parse --short HEAD)
 DATE := $(shell date +%Y%m%d)

scripts/post-release-process.sh

@@ -10,6 +10,19 @@ KUSTOMIZE=$(pwd)/bin/kustomize
 # Add new ## unreleased after the tagging (post-release-process.sh)
 gawk -i inplace  '/##/ && ++c==1 { print "## unreleased\n"; print; next }1' CHANGELOG.md
 
+CURRENT_BRANCH=$(git branch --show-current)
+
+if [ $CURRENT_BRANCH != "master" ]; then
+    # This is a release branch, we only bump the patch version
+    PATCH_RELEASE=true
+    scripts/update-makefile-version.sh
+    NEXT_VERSION=$(gawk 'match($0, /^VERSION \?= /) { print substr($0, RLENGTH+1)}' Makefile)
+    git add Makefile
+    git add CHANGELOG.md
+    git commit -m "Prepare for next version $NEXT_VERSION"
+    return
+fi
+
 # Modify Makefile for the next VERSION in line
 scripts/update-makefile-version.sh
 
@@ -27,8 +40,6 @@ yq eval -i '.defaults.cassandra.repository |= sub("cr.k8ssandra.io/", "")' confi
 yq eval -i '.images.config-builder |= sub("cr.dtsx.io/", "")' config/manager/image_config.yaml
 yq eval -i '.defaults.dse.repository |= sub("cr.dtsx.io/", "")' config/manager/image_config.yaml
 
-
-
 # Commit to git
 NEXT_VERSION=$(gawk 'match($0, /^VERSION \?= /) { print substr($0, RLENGTH+1)}' Makefile)
 

scripts/pre-release-process.sh

@@ -5,10 +5,20 @@ if [[ ! $0 == scripts/* ]]; then
 fi
 
 if [ "$#" -le 1 ]; then
-    echo "Usage: scripts/pre-release-process.sh newTag"
+    echo "Usage: scripts/pre-release-process.sh newTag [prevTag]"
+    echo ""
+    echo "If prevTag is not set, it will default to the latest tag in the repository"
+    echo "usage of prevTag is required when releasing a patch version from a branch"
     exit
 fi
 
+CURRENT_BRANCH=$(git branch --show-current)
+
+if [[ $CURRENT_BRANCH != "master" && -z "$2" ]]; then
+    echo "You must provide a prevTag when releasing from a branch"
+    exit 1
+fi
+
 TAG=$1
 PREVTAG=$(git describe --abbrev=0 --tags)
 IMG=cr.k8ssandra.io/k8ssandra/cass-operator:${TAG}
@@ -32,16 +42,20 @@ sed -i '' -e "s/$PREVTAG/$TAG/g" README.md
 cd config/manager && $KUSTOMIZE edit set image controller=$IMG && cd -
 
 # Modify config/manager/image_config.yaml to have proper version for server-system-logger
-LOG_IMG=k8ssandra/system-logger:${TAG} yq eval -i '.images.system-logger = env(LOG_IMG)' config/manager/image_config.yaml
+LOG_IMG=k8ssandra/system-logger:${TAG} yq eval -i '.images.system-logger = "cr.k8ssandra.io/" + env(LOG_IMG)' config/manager/image_config.yaml
+
+# Add prefixes to image_config if not already set
+CLIENT_VALUE=$(yq '.images.k8ssandra-client' config/manager/image_config.yaml)
 
-# Add cr.k8ssandra.io prefixes
-yq eval -i '.images.system-logger |= "cr.k8ssandra.io/" + .' config/manager/image_config.yaml
-yq eval -i '.images.k8ssandra-client |= "cr.k8ssandra.io/" + .' config/manager/image_config.yaml
-yq eval -i '.defaults.cassandra.repository |= "cr.k8ssandra.io/" + .' config/manager/image_config.yaml
+if [[ ! $CLIENT_VALUE == cr.k8ssandra.io* ]]; then
+    # Add cr.k8ssandra.io prefixes
+    yq eval -i '.images.k8ssandra-client |= "cr.k8ssandra.io/" + .' config/manager/image_config.yaml
+    yq eval -i '.defaults.cassandra.repository |= "cr.k8ssandra.io/" + .' config/manager/image_config.yaml
 
-# Add cr.dstx.io prefixes
-yq eval -i '.images.config-builder |= "cr.dtsx.io/" + .' config/manager/image_config.yaml
-yq eval -i '.defaults.dse.repository |= "cr.dtsx.io/" + .' config/manager/image_config.yaml
+    # Add cr.dstx.io prefixes
+    yq eval -i '.images.config-builder |= "cr.dtsx.io/" + .' config/manager/image_config.yaml
+    yq eval -i '.defaults.dse.repository |= "cr.dtsx.io/" + .' config/manager/image_config.yaml
+fi
 
 # Modify the controller