[CASSANDRA] Add some fixes for K8ssandra Operator

[oom.git] / kubernetes / common / common / templates / _cassOp.tpl

diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index c360a0f..b0cf8e3 100644 (file)
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -1,3 +1,19 @@
+{{/*
+# Copyright © 2022 Deutsche Telekom AG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+*/}}
+
 {{/* Cassandra Data Center. */}}
 {{- define "common.k8ssandraCluster" -}}
 {{- $global := .Values.global }}
@@ -7,18 +23,40 @@ kind: K8ssandraCluster
 metadata:
   name: {{ .Values.k8ssandraOperator.config.clusterName }}
 spec:
+  {{ if .Values.k8ssandraOperator.reaper.enabled -}}
   reaper:
+    initContainerImage:
+      registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
-    heapSize: 512Mi
     autoScheduling:
       enabled: true
+    metadata:
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}-reaper
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
+    {{- if .Values.metrics.enabled }}
+    telemetry:
+      prometheus:
+        enabled: true
+      mcac:
+        enabled: false
+      cassandra:
+        endpoint:
+          address: 0.0.0.0
+    {{- end }}
+  {{- end }}
+  {{ if .Values.k8ssandraOperator.stargate.enabled -}}
   stargate:
     containerImage:
       registry: {{ include "repositoryGenerator.dockerHubRepository" . }}
       tag: {{ .Values.k8ssandraOperator.stargate.tag }}
     size: {{ .Values.k8ssandraOperator.stargate.size }}
     heapSize: {{ .Values.k8ssandraOperator.stargate.jvmOptions.heapSize }}
+    metadata:
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}-stargate
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
     livenessProbe:
       initialDelaySeconds: 200
       periodSeconds: 10
@@ -31,6 +69,7 @@ spec:
       failureThreshold: 20
       successThreshold: 1
       timeoutSeconds: 20
+  {{- end }}
   cassandra:
     serverVersion: {{ .Values.k8ssandraOperator.cassandraVersion }}
     storageConfig:
@@ -45,6 +84,16 @@ spec:
             storage: {{ .Values.k8ssandraOperator.persistence.size }}
     superuserSecretRef:
       name: {{ include "common.fullname" . }}-{{ .Values.k8ssandraOperator.config.secretName }}
+    {{- if .Values.metrics.enabled }}
+    telemetry:
+      prometheus:
+        enabled: true
+      mcac:
+        enabled: false
+      cassandra:
+        endpoint:
+          address: 0.0.0.0
+    {{- end }}
     config:
       {{ if .Values.k8ssandraOperator.config.casOptions -}}
       cassandraYaml:
@@ -67,5 +116,8 @@ spec:
       pods:
         annotations:
           {{ toYaml .Values.podAnnotations | nindent 10 }}
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
     {{- end }}
 {{ end }}