Prepare for next version 1.19.0

k8ssandra · Oct 25, 2023 · 9237453 · 9237453
1 parent 3842048
commit 9237453
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 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
+
 ## v1.18.0
 
 * [CHANGE] [#479](https://github.com/k8ssandra/cass-operator/issues/479) Set the default deployed DSE image to use our newer management-api by changing the repository to datastax/dse-mgmtapi-6_8

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.18.0
+VERSION ?= 1.19.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:v1.18.0"
-  config-builder: "cr.dtsx.io/datastax/cass-config-builder:1.0-ubi7"
-  k8ssandra-client: "cr.k8ssandra.io/k8ssandra/k8ssandra-client:v0.2.1"
+  system-logger: "k8ssandra/system-logger:latest"
+  config-builder: "datastax/cass-config-builder:1.0-ubi7"
+  k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.1"
   # cassandra:
   #   "4.0.0": "k8ssandra/cassandra-ubi:latest"
   # dse:
@@ -17,8 +17,8 @@ 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"
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: v1.18.0
+  newName: k8ssandra/cass-operator
+  newTag: latest
diff --git a/scripts/post-release-process.sh b/scripts/post-release-process.sh
@@ -14,6 +14,16 @@ cd config/manager && $KUSTOMIZE edit set image controller=$IMG && cd -
 # Return config/manager/image_config.yaml to :latest
 LOG_IMG=k8ssandra/system-logger:latest yq eval -i '.images.system-logger = env(LOG_IMG)' config/manager/image_config.yaml
 
+# Remove cr.k8ssandra.io prefixes
+yq eval -i '.images.k8ssandra-client |= sub("cr.k8ssandra.io/", "")' config/manager/image_config.yaml
+yq eval -i '.defaults.cassandra.repository |= sub("cr.k8ssandra.io/", "")' config/manager/image_config.yaml
+
+# Remove cr.dstx.io prefixes
+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)