Prepare for next version 1.22.0

k8ssandra · Jun 24, 2024 · 47e0ba4 · 47e0ba4
1 parent 2cba320
commit 47e0ba4
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,8 @@ Changelog for Cass Operator, new PRs should update the `main / unreleased` secti
 * [BUGFIX]
 ```
 
+## unreleased
+
 ## 1.21.1
 
 * [BUGFIX] [#665](https://github.com/k8ssandra/cass-operator/issues/665) The RequiresUpdate and ObservedGenerations were updated too often, even when the reconcile was not finished.

diff --git a/Makefile b/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.21.1
+VERSION ?= 1.22.0
 
 COMMIT := $(shell git rev-parse --short HEAD)
 DATE := $(shell date +%Y%m%d)

diff --git a/config/manager/image_config.yaml b/config/manager/image_config.yaml
@@ -3,9 +3,9 @@ kind: ImageConfig
 metadata:
   name: image-config
 images:
-  system-logger: "cr.k8ssandra.io/k8ssandra/system-logger:1.21.1"
-  config-builder: "cr.dtsx.io/datastax/cass-config-builder:1.0-ubi8"
-  k8ssandra-client: "cr.k8ssandra.io/k8ssandra/k8ssandra-client:v0.4.0"
+  system-logger: "k8ssandra/system-logger:latest"
+  config-builder: "datastax/cass-config-builder:1.0-ubi8"
+  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.4.0"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
   # dse:
@@ -17,10 +17,10 @@ images:
 defaults:
   # Note, postfix is ignored if repository is not set
   cassandra:
-    repository: "cr.k8ssandra.io/k8ssandra/cass-management-api"
+    repository: "k8ssandra/cass-management-api"
     suffix: "-ubi8"
   dse:
-    repository: "cr.dtsx.io/datastax/dse-mgmtapi-6_8"
+    repository: "datastax/dse-mgmtapi-6_8"
     suffix: "-ubi8"
   hcd:
     repository: "datastax/hcd"

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -13,5 +13,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: cr.k8ssandra.io/k8ssandra/cass-operator
-  newTag: 1.21.1
+  newName: k8ssandra/cass-operator
+  newTag: latest
diff --git a/scripts/lib.sh b/scripts/lib.sh
@@ -20,12 +20,15 @@ next_version() {
     for i in {1..3}
     do
         local PART=$(echo $CURRENT_VERSION | sed -e "s#$RE#\\$i#")
+        ARRAY_INDEX=$((i-1))
+        NEXT_VERSION_PARTS[$ARRAY_INDEX]=$PART
+
         if [ $i == $VERSION_PART ]
         then
             let PART+=1
+            NEXT_VERSION_PARTS[$ARRAY_INDEX]=$PART
+            break
         fi
-        ARRAY_INDEX=$((i-1))
-        NEXT_VERSION_PARTS[$ARRAY_INDEX]=$PART
     done
 
     NEXT_VERSION=${NEXT_VERSION_PARTS[0]}.${NEXT_VERSION_PARTS[1]}.${NEXT_VERSION_PARTS[2]}