Merge branch 'release/1.11'

k8ssandra · Dec 20, 2023 · 92897db · 92897db
2 parents 5aeee36 + d83a715
commit 92897db
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/CHANGELOG/CHANGELOG-1.11.md b/CHANGELOG/CHANGELOG-1.11.md
@@ -15,9 +15,13 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 
 ## unreleased
 
+## v1.11.0 - 2023-12-20
+
 * [CHANGE] Upgrade to Medusa v0.17.0
+* [CHANGE] Upgrade to cass-operator v1.18.2
 * [FEATURE] [#659](https://github.com/thelastpickle/cassandra-medusa/issues/659) Add support for DSE search 
 * [ENHANCEMENT] [#1125](https://github.com/k8ssandra/k8ssandra-operator/issues/1125) Support Stargate with DSE and upgrade Stargate to 1.0.77
 * [ENHANCEMENT] [#1122](https://github.com/k8ssandra/k8ssandra-operator/issues/1122) Expose backup size in MedusaBackup CRD
 * [BUGFIX] [#1145](https://github.com/k8ssandra/k8ssandra-operator/issues/1145) Add missing MutatingWebhook configuration to the Helm chart
 * [BUGFIX] [#1132](https://github.com/k8ssandra/k8ssandra-operator/issues/1132) Fix mismatch between Cassandra pods from different cluster when running backup ops
+* [BUGFIX] [#1119](https://github.com/k8ssandra/k8ssandra-operator/issues/1119) Fix k8ssandra cluster upgrade failures between 3.x and 4.x versions
diff --git a/Makefile b/Makefile
@@ -285,8 +285,9 @@ kind-load-image:
 	kind load docker-image --name $(KIND_CLUSTER) cr.k8ssandra.io/${IMG}
 
 kind-load-image-multi:
+	docker tag ${IMG} cr.k8ssandra.io/${IMG}
 	for ((i = 0; i < $(NUM_CLUSTERS); ++i)); do \
-		kind load docker-image --name k8ssandra-$$i ${IMG}; \
+		kind load docker-image --name k8ssandra-$$i cr.k8ssandra.io/${IMG}; \
 	done
 
 ##@ Deployment