From 891eeb77f57dcb28db018fab84ece4b46758a162 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 12 Oct 2023 13:10:53 +0200 Subject: [CASSANDRA] Add Reaper and Stargate label checked by SDC/AAI Schema creations of Reaper and AAI/SDC can conflict with each other. Therefor the reaper init script should finish before AAI and SDC schema init scripts are started Update jvm options for cassandra instance Issue-ID: OOM-3246 Change-Id: I16cea161fc8b75e15c76c4cbe4851739782dfb06 Signed-off-by: Andreas Geissler --- kubernetes/common/cassandra/values.yaml | 3 ++- kubernetes/common/common/templates/_cassOp.tpl | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) (limited to 'kubernetes/common') diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index 930fe9b2d3..eef716eae6 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -41,7 +41,8 @@ k8ssandraOperator: casOptions: authorizer: AllowAllAuthorizer jvmOptions: - heapSize: 512M + heap_initial_size: 512M + heap_max_size: 4096M hostNetwork: false datacenters: - name: dc1 diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl index d0f23877a4..3ea3ff17d0 100644 --- a/kubernetes/common/common/templates/_cassOp.tpl +++ b/kubernetes/common/common/templates/_cassOp.tpl @@ -24,16 +24,26 @@ metadata: name: {{ .Values.k8ssandraOperator.config.clusterName }} spec: reaper: + initContainerImage: + registry: {{ include "repositoryGenerator.dockerHubRepository" . }} containerImage: registry: {{ include "repositoryGenerator.dockerHubRepository" . }} 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 -- cgit 1.2.3-korg