X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fcommon%2Fcommon%2Ftemplates%2F_cassOp.tpl;h=3ea3ff17d0a9ff7c0468259ca02545ed8473c46c;hb=891eeb77f57dcb28db018fab84ece4b46758a162;hp=6cf9c3ce7e4e03e7320836ef16a974573dc386ab;hpb=491446e0ef8966809476e969544ef6187e39bd58;p=oom.git

diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl
index 6cf9c3ce7e..3ea3ff17d0 100644
--- 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 }}
@@ -8,17 +24,26 @@ metadata:
   name: {{ .Values.k8ssandraOperator.config.clusterName }}
 spec:
   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 }}
   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
@@ -35,7 +60,9 @@ spec:
     serverVersion: {{ .Values.k8ssandraOperator.cassandraVersion }}
     storageConfig:
       cassandraDataVolumeClaimSpec:
+        {{ if .Values.k8ssandraOperator.persistence.storageClassName -}}
         storageClassName: {{ .Values.k8ssandraOperator.persistence.storageClassName }}
+        {{- end }}
         accessModes:
           - ReadWriteOnce
         resources:
@@ -60,4 +87,13 @@ spec:
           name: {{ $datacenter.name }}
         size: {{ $datacenter.size }}
       {{- end }}
+    {{ if .Values.podAnnotations -}}
+    metadata:
+      pods:
+        annotations:
+          {{ toYaml .Values.podAnnotations | nindent 10 }}
+      commonLabels:
+        app: {{ .Values.k8ssandraOperator.config.clusterName }}
+        version: {{ .Values.k8ssandraOperator.cassandraVersion }}
+    {{- end }}
 {{ end }}