Merge "[POLICY] Add kafka support in policy charts"
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 2fc368f..0ab1f09 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -40,11 +40,12 @@
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 @@
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 @@
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 b9f6766..b0cf8e3 100644
--- a/kubernetes/common/common/templates/_cassOp.tpl
+++ b/kubernetes/common/common/templates/_cassOp.tpl
@@ -35,6 +35,16 @@
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 @@
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: