Additional annotations (#1169)

* CommonAnnotations field to be passed down into cassDC.
k8ssandra · Jan 16, 2024 · 4f244a9 · 4f244a9
1 parent f25850d
commit 4f244a9
Show file tree

Hide file tree

Showing 16 changed files with 100 additions and 616 deletions.
diff --git a/CHANGELOG/CHANGELOG-1.12.md b/CHANGELOG/CHANGELOG-1.12.md
@@ -14,7 +14,9 @@ Changelog for the K8ssandra Operator, new PRs should update the `unreleased` sec
 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
-
+- [ENHANCEMENT] [#1094](https://github.com/k8ssandra/k8ssandra-operator/issues/1094) Expose AdditionalAnnotations field for cassDC.
+* [ENHANCEMENT] [#1160](https://github.com/k8ssandra/k8ssandra-operator/issues/1160) Allow disabling Reaper front-end auth.
+- [ENHANCEMENT] [#1115](https://github.com/k8ssandra/k8ssandra-operator/issues/1115) Add a validation check for the projected pod names length
 * [CHANGE] [#1050](https://github.com/k8ssandra/k8ssandra-operator/issues/1050) Remove unnecessary requeues in the Medusa controllers
 * [CHANGE] [#1165](https://github.com/k8ssandra/k8ssandra-operator/issues/1165) Upgrade to Medusa v0.17.1
 * [FEATURE] [#1165](https://github.com/k8ssandra/k8ssandra-operator/issues/1165) Expose Medusa ssl_verify option to allow disabling cert verification for some on prem S3 compatible systems

diff --git a/Makefile b/Makefile
@@ -491,8 +491,8 @@ catalog-push: ## Push a catalog image.
 # E2E tests from kuttl
 kuttl-test: install-kuttl docker-build
 	./bin/kubectl-kuttl test --kind-context=k8ssandra-0 --start-kind=false --test test-servicemonitors
-	# ./bin/kubectl-kuttl test --kind-context=k8ssandra-0 --start-kind=false --test test-cassandra-versions
-	# ./bin/kubectl-kuttl test --kind-context=k8ssandra-0 --start-kind=false --test test-user-defined-ns
+	./bin/kubectl-kuttl test --kind-context=k8ssandra-0 --start-kind=false --test test-cassandra-versions
+	./bin/kubectl-kuttl test --kind-context=k8ssandra-0 --start-kind=false --test test-user-defined-ns
 
  # Install kuttl for e2e tests.
 install-kuttl:

diff --git a/apis/k8ssandra/v1alpha1/k8ssandracluster_types.go b/apis/k8ssandra/v1alpha1/k8ssandracluster_types.go
@@ -483,11 +483,16 @@ type EmbeddedObjectMeta struct {
 	// +optional
 	meta.Tags `json:",inline"`
 
-	// labels/annotations that will be applied to all components
+	// labels that will be applied to all components
 	// created by the CRD
 	// +optional
 	CommonLabels map[string]string `json:"commonLabels,omitempty"`
 
+	// annotations that will be applied to all components
+	// created by the CRD
+	// +optional
+	CommonAnnotations map[string]string `json:"commonAnnotations,omitempty"`
+
 	// labels/annotations for the pod components
 	// +optional
 	Pods meta.Tags `json:"pods,omitempty"`

diff --git a/apis/k8ssandra/v1alpha1/zz_generated.deepcopy.go b/apis/k8ssandra/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/cass-operator/cluster-scoped/kustomization.yaml b/config/cass-operator/cluster-scoped/kustomization.yaml
@@ -2,7 +2,10 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=v1.18.2
+- github.com/k8ssandra/cass-operator/config/deployments/cluster?ref=master
 
 components:
   - ../../components/cass-operator-image-config
+images:
+- name: k8ssandra/cass-operator
+  newTag: v1.19.0-dev.ff5bc87-20240111
diff --git a/config/cass-operator/ns-scoped/kustomization.yaml b/config/cass-operator/ns-scoped/kustomization.yaml
@@ -2,7 +2,11 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
 resources:
-- github.com/k8ssandra/cass-operator/config/deployments/default?ref=v1.18.2
+- github.com/k8ssandra/cass-operator/config/deployments/default?ref=master
 
 components:
   - ../../components/cass-operator-image-config
+
+images:
+- name: k8ssandra/cass-operator
+  newTag: v1.19.0-dev.ff5bc87-20240111
diff --git a/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml b/config/crd/bases/k8ssandra.io_k8ssandraclusters.yaml
@@ -9486,11 +9486,17 @@ spec:
                               additionalProperties:
                                 type: string
                               type: object
+                            commonAnnotations:
+                              additionalProperties:
+                                type: string
+                              description: annotations that will be applied to all
+                                components created by the CRD
+                              type: object
                             commonLabels:
                               additionalProperties:
                                 type: string
-                              description: labels/annotations that will be applied
-                                to all components created by the CRD
+                              description: labels that will be applied to all components
+                                created by the CRD
                               type: object
                             labels:
                               additionalProperties:
@@ -22739,11 +22745,17 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
+                      commonAnnotations:
+                        additionalProperties:
+                          type: string
+                        description: annotations that will be applied to all components
+                          created by the CRD
+                        type: object
                       commonLabels:
                         additionalProperties:
                           type: string
-                        description: labels/annotations that will be applied to all
-                          components created by the CRD
+                        description: labels that will be applied to all components
+                          created by the CRD
                         type: object
                       labels:
                         additionalProperties:

diff --git a/go.mod b/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/go-logr/zapr v1.2.3
 	github.com/google/uuid v1.3.0
 	github.com/gruntwork-io/terratest v0.37.7
-	github.com/k8ssandra/cass-operator v1.18.1
+	github.com/k8ssandra/cass-operator v1.18.1-0.20240109145046-4215a6003303
 	github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.52.1

diff --git a/go.sum b/go.sum
@@ -653,6 +653,8 @@ github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/X
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
+github.com/k8ssandra/cass-operator v1.18.1-0.20240109145046-4215a6003303 h1:NwcRMl97EFzya4Rmt2DuEE6pinzd9JRLbGaY+djWEjE=
+github.com/k8ssandra/cass-operator v1.18.1-0.20240109145046-4215a6003303/go.mod h1:8gYoASfrQYiDmvfMAeYSe31dO1qVe8uIISJeVXGFSiI=
 github.com/k8ssandra/cass-operator v1.18.1 h1:5EzHuIIdoka92ysId0bgpM0KSn532k6+XS0Srvvv0bE=
 github.com/k8ssandra/cass-operator v1.18.1/go.mod h1:8gYoASfrQYiDmvfMAeYSe31dO1qVe8uIISJeVXGFSiI=
 github.com/k8ssandra/reaper-client-go v0.3.1-0.20220114183114-6923e077c4f5 h1:Dq0VdM960G3AbhYwFuaebmsE08IzOYHYhngUfDmWaAc=