diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-06-27 10:33:22 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-06-27 10:33:22 +0000 |
| commit | 72a1a8c6cac5ccdde7ee83347db903cbad35faca (patch) | |
| tree | c7b4decf5e2b3cbc6b43784e884ad023e7726575 /kubernetes/common/cassandra | |
| parent | 32e6f019f177c8fcfa758fe1dfecad587b38e18e (diff) | |
| parent | fc61c9f4cb2bf2483b778fda55ef81cfdfb2afed (diff) | |
Merge "[COMMON] Fix various helm errors" into london
Diffstat (limited to 'kubernetes/common/cassandra')
| -rw-r--r-- | kubernetes/common/cassandra/templates/statefulset.yaml | 9 | ||||
| -rw-r--r-- | kubernetes/common/cassandra/values.yaml | 3 |
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 |