Merge branch 'main' into feature/medusa-bucket-secret-label

k8ssandra · Apr 3, 2024 · 3528dd0 · 3528dd0
2 parents 0bbb969 + c167256
commit 3528dd0
Show file tree

Hide file tree

Showing 17 changed files with 19,371 additions and 21 deletions.
diff --git a/CHANGELOG/CHANGELOG-1.13.md b/CHANGELOG/CHANGELOG-1.13.md
@@ -15,9 +15,6 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 
 ## unreleased
 
-* [BUGFIX] [#1235](https://github.com/k8ssandra/k8ssandra-operator/issues/1235) Prevent operator from modifying the spec when superUserRef is not set. Also, remove the injection to mount secrets to cassandra container.
-* [BUGFIX] [#1239](https://github.com/k8ssandra/k8ssandra-operator/issues/1239) Use `concurrent_transfers` setting from MedusaConfiguration object if it is actually set.
-
 ## v1.13.0 - 2024-02-24
 
 * [ENHANCEMENT] [#1159](https://github.com/k8ssandra/k8ssandra-operator/issues/1159) Replicate bucket key secrets to namespaces hosting clusters

diff --git a/CHANGELOG/CHANGELOG-1.14.md b/CHANGELOG/CHANGELOG-1.14.md
@@ -16,7 +16,15 @@ When cutting a new release, update the `unreleased` heading to the tag being gen
 ## unreleased
 * [BUGFIX] [#1253](https://github.com/k8ssandra/k8ssandra-operator/issues/1253) Medusa storage secrets are now labelled with a unique label.
 * [FEATURE] [#1260](https://github.com/k8ssandra/k8ssandra-operator/issues/1260) Update controller-gen to version 0.14.0.
+
+
+## v1.14.0 - 2024-04-02
+
 * [FEATURE] [#1242](https://github.com/k8ssandra/k8ssandra-operator/issues/1242) Allow for creation of replicated secrets with a prefix, so that we can distinguish between multiple secrets with the same origin but targeting different clusters.
 * [BUGFIX] [#1226](https://github.com/k8ssandra/k8ssandra-operator/issues/1226) Medusa purge cronjob should be created in the operator namespace
 * [BUGFIX] [#1141](https://github.com/k8ssandra/k8ssandra-operator/issues/1141) Use DC name override when naming secondary resources
 * [BUGFIX] [#1138](https://github.com/k8ssandra/k8ssandra-operator/issues/1138) Use cluster name override for metrics agent ConfigMap 
+* [BUGFIX] [#1252](https://github.com/k8ssandra/k8ssandra-operator/issues/1252) Sanitize DC name in pods selector
+* [CHANGE] Update Medusa to v0.20.1
+* [BUGFIX] [#1235](https://github.com/k8ssandra/k8ssandra-operator/issues/1235) Prevent operator from modifying the spec when superUserRef is not set. Also, remove the injection to mount secrets to cassandra container.
+* [BUGFIX] [#1239](https://github.com/k8ssandra/k8ssandra-operator/issues/1239) Use `concurrent_transfers` setting from MedusaConfiguration object if it is actually set.
diff --git a/CHANGELOG/CHANGELOG-1.15.md b/CHANGELOG/CHANGELOG-1.15.md
@@ -0,0 +1,16 @@
+# Changelog
+
+Changelog for the K8ssandra Operator, new PRs should update the `unreleased` section below with entries describing the changes like:
+
+```markdown
+* [CHANGE]
+* [FEATURE]
+* [ENHANCEMENT]
+* [BUGFIX]
+* [DOCS]
+* [TESTING]
+```
+
+When cutting a new release, update the `unreleased` heading to the tag being generated and date, like `## vX.Y.Z - YYYY-MM-DD` and create a new placeholder section for  `unreleased` entries.
+
+## unreleased
diff --git a/charts/k8ssandra-operator/Chart.yaml b/charts/k8ssandra-operator/Chart.yaml
@@ -3,13 +3,13 @@ name: k8ssandra-operator
 description: |
   Kubernetes operator which handles the provisioning and management of K8ssandra clusters.
 type: application
-version: 1.14.0-SNAPSHOT
+version: 1.15.0-SNAPSHOT
 dependencies:
   - name: k8ssandra-common
     version: 0.29.0
     repository: https://helm.k8ssandra.io
   - name: cass-operator
-    version: 0.47.0
+    version: 0.47.2
     repository: https://helm.k8ssandra.io
 home: https://github.com/k8ssandra/k8ssandra-operator
 sources:

diff --git a/config/cass-operator/cluster-scoped/kustomization.yaml b/config/cass-operator/cluster-scoped/kustomization.yaml
@@ -2,10 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=master
+- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.19.1
 
 components:
   - ../../components/cass-operator-image-config
 images:
 - name: k8ssandra/cass-operator
-  newTag: v1.19.0-dev.ff5bc87-20240111
+  newTag: v1.19.1
diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml
@@ -2,11 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/default?ref=master
+- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.19.1
 
 components:
   - ../../components/cass-operator-image-config
 
 images:
 - name: k8ssandra/cass-operator
-  newTag: v1.19.0-dev.ff5bc87-20240111
+  newTag: v1.19.1
diff --git a/config/components/cass-operator-image-config/image_config.yaml b/config/components/cass-operator-image-config/image_config.yaml
@@ -3,7 +3,7 @@ kind: ImageConfig
 metadata:
   name: image-config
 images:
-  system-logger: "k8ssandra/system-logger:v1.18.2"
+  system-logger: "k8ssandra/system-logger:v1.19.1"
   config-builder: "datastax/cass-config-builder:1.0.7"
   k8ssandra-client: "k8ssandra/k8ssandra-client:v0.2.2"
   # cassandra:

diff --git a/docs/content/en/reference/crd/k8ssandra-operator-crds-latest/_index.md b/docs/content/en/reference/crd/k8ssandra-operator-crds-latest/_index.md
@@ -78082,6 +78082,13 @@ ReplicatedSecretSpec defines the desired state of ReplicatedSecret
           TODO Implement at some point Namespace to replicate the data to in the target cluster. If left empty, current namespace is used.<br/>
         </td>
         <td>false</td>
+      </tr><tr>
+        <td><b>targetPrefix</b></td>
+        <td>string</td>
+        <td>
+          TargetPrefix is the prefix to be used for the replicated secret in the target cluster. If left empty, the same name is used as the original secret.<br/>
+        </td>
+        <td>false</td>
       </tr></tbody>
 </table>