From 1eeb37b34517aecb0fdcef2e486188768b5ee513 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 9 Apr 2024 13:58:38 +0200 Subject: [PATCH] [CASSANDRA] Add some fixes for K8ssandra Operator Some ports need to be excluded from cassandra to support JMX and Metrics interfaces. Also some memory settings need to be adjusted. Issue-ID: OOM-3275 Change-Id: I7530b69d65c7c612bcf54eba64d5a4dd5a20f753 Signed-off-by: Andreas Geissler --- kubernetes/common/cassandra/values.yaml | 11 +++++------ kubernetes/common/common/templates/_cassOp.tpl | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 6 deletions(-) diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml index 2fc368f04f..0ab1f0961c 100644 --- a/kubernetes/common/cassandra/values.yaml +++ b/kubernetes/common/cassandra/values.yaml @@ -40,11 +40,12 @@ k8ssandraOperator: superuserPassword: &superuserpassword cassandra casOptions: authorizer: AllowAllAuthorizer + read_request_timeout: 10000ms write_request_timeout: 10000ms counter_write_request_timeout: 15000ms jvmOptions: heap_initial_size: 512M - heap_max_size: 4096M + heap_max_size: 8192M hostNetwork: false datacenters: - name: dc1 @@ -159,11 +160,9 @@ service: podAnnotations: # sidecar.istio.io/inject: "false" - traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001" + traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001,7199,50051" traffic.sidecar.istio.io/includeInboundPorts: '*' - traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001" - prometheus.io/scrape: 'true' - prometheus.io/port: '8080' + traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001,7199,50051" podManagementPolicy: OrderedReady updateStrategy: @@ -211,7 +210,7 @@ configOverrides: {} resources: limits: cpu: "2" - memory: "8Gi" + memory: "16Gi" requests: cpu: "0.2" memory: "2.5Gi" diff --git a/kubernetes/common/common/templates/_cassOp.tpl b/kubernetes/common/common/templates/_cassOp.tpl index b9f676665f..b0cf8e331e 100644 --- a/kubernetes/common/common/templates/_cassOp.tpl +++ b/kubernetes/common/common/templates/_cassOp.tpl @@ -35,6 +35,16 @@ spec: 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: @@ -74,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: -- 2.16.6