[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
(cherry picked from commit bc550dc1ea4de60e7ebf1073b340d7c62e2258ef)

5 files changed, 4 insertions, 17 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
diff --git a/kubernetes/common/etcd/templates/service.yaml b/kubernetes/common/etcd/templates/service.yaml
index 04fc93af00..1199b22447 100644
--- a/kubernetes/common/etcd/templates/service.yaml
+++ b/kubernetes/common/etcd/templates/service.yaml
@@ -19,7 +19,6 @@ kind: Service
 metadata:
   annotations:
     service.alpha.kubernetes.io/tolerate-unready-endpoints: "true"
-metadata:
   name: {{ include "common.servicename" .  }}
   labels:
     heritage: "{{ .Release.Service  }}"
diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index 9b4c05ef70..6af9135367 100644
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -31,7 +31,7 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ include "common.servicename" . }}
   portLevelMtls:
-    {{ .Values.service.internalPort }}:
+    '{{ .Values.service.internalPort }}':
       mode: DISABLE
 {{- end}}
 {{- end}}
diff --git a/kubernetes/common/postgres-init/templates/job.yaml b/kubernetes/common/postgres-init/templates/job.yaml
index fa4a990d06..15260f0b16 100644
--- a/kubernetes/common/postgres-init/templates/job.yaml
+++ b/kubernetes/common/postgres-init/templates/job.yaml
@@ -80,12 +80,6 @@ spec:
           value: "{{ .Values.config.pgDatabase }}"
         - name: PG_ROOT_PASSWORD_INPUT
           {{- include "common.secret.envFromSecretFast" (dict "global" . "uid" (include "common.postgres.secret.rootPassUID" .) "key" "password") | indent 10 }}
-        volumeMounts:
-        - mountPath: /config-input/setup.sql
-          name: config
-          subPath: setup.sql
-        - mountPath: /config
-          name: pgconf
         image: {{ include "repositoryGenerator.image.postgres" . }}
         imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
         name: {{ include "common.name" . }}-update-config