summaryrefslogtreecommitdiffstats
path: root/kubernetes/common/cassandra
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-06-26 17:09:35 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2023-06-26 17:09:35 +0200
commitbc550dc1ea4de60e7ebf1073b340d7c62e2258ef (patch)
treeeb6d08a02604db7ad175b896f8cd9b66cc1e6e96 /kubernetes/common/cassandra
parent970079ae2f4c7b558b218cfb53264f4f40d488a3 (diff)
[COMMON] Fix various helm errors
Fixes in helmcharts which are not detected by helm, but kustomize in common, CDS, POLICY, SDC, SO Issue-ID: OOM-3200 Issue-ID: OOM-3201 Issue-ID: OOM-3202 Issue-ID: OOM-3203 Issue-ID: OOM-3204 Issue-ID: OOM-3205 Issue-ID: OOM-3206 Issue-ID: OOM-3207 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de> Change-Id: I8416726693d6606d936aaf4cfe2c097752689c29
Diffstat (limited to 'kubernetes/common/cassandra')
-rw-r--r--kubernetes/common/cassandra/templates/statefulset.yaml9
-rw-r--r--kubernetes/common/cassandra/values.yaml3
2 files changed, 3 insertions, 9 deletions
diff --git a/kubernetes/common/cassandra/templates/statefulset.yaml b/kubernetes/common/cassandra/templates/statefulset.yaml
index 2e73309bb7..dff70820e9 100644
--- a/kubernetes/common/cassandra/templates/statefulset.yaml
+++ b/kubernetes/common/cassandra/templates/statefulset.yaml
@@ -27,15 +27,6 @@ spec:
type: {{ .Values.updateStrategy.type }}
template:
metadata: {{- include "common.templateMetadata" . | nindent 6 }}
- {{- if or .Values.podAnnotations (and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations) }}
- annotations:
- {{- if .Values.podAnnotations }}
- {{- include "common.tplValue" (dict "value" .Values.podAnnotations "context" $) | nindent 8 }}
- {{- end }}
- {{- if and .Values.metrics.serviceMonitor.enabled .Values.metrics.podAnnotations }}
- {{- include "common.tplValue" (dict "value" .Values.metrics.podAnnotations "context" $) | nindent 8 }}
- {{- end }}
- {{- end }}
spec:
hostNetwork: {{ .Values.hostNetwork }}
imagePullSecrets:
diff --git a/kubernetes/common/cassandra/values.yaml b/kubernetes/common/cassandra/values.yaml
index 13137a182b..66e6d795cc 100644
--- a/kubernetes/common/cassandra/values.yaml
+++ b/kubernetes/common/cassandra/values.yaml
@@ -151,6 +151,9 @@ podAnnotations:
traffic.sidecar.istio.io/excludeInboundPorts: "7000,7001"
traffic.sidecar.istio.io/includeInboundPorts: '*'
traffic.sidecar.istio.io/excludeOutboundPorts: "7000,7001"
+ prometheus.io/scrape: 'true'
+ prometheus.io/port: '8080'
+
podManagementPolicy: OrderedReady
updateStrategy:
type: RollingUpdate