Merge "[COMMON][MARIABD] MariaDB ServiceMesh compatibility"

4 files changed, 35 insertions, 14 deletions

diff --git a/kubernetes/common/mariadb-galera/templates/metrics-svc.yaml b/kubernetes/common/mariadb-galera/templates/metrics-svc.yaml
index e71351e9cb..841aab3e17 100644
--- a/kubernetes/common/mariadb-galera/templates/metrics-svc.yaml
+++ b/kubernetes/common/mariadb-galera/templates/metrics-svc.yaml
@@ -27,8 +27,8 @@ metadata:
 spec:
   type: {{ .Values.metrics.service.type }}
   ports:
-    - name: metrics
+    - name: tcp-metrics
       port: {{ .Values.metrics.service.port }}
-      targetPort: metrics
+      targetPort: tcp-metrics
   selector: {{- include "common.matchLabels" . | nindent 4 }}
 {{- end }}
diff --git a/kubernetes/common/mariadb-galera/templates/service.yaml b/kubernetes/common/mariadb-galera/templates/service.yaml
index 75aff985e5..880bc55612 100644
--- a/kubernetes/common/mariadb-galera/templates/service.yaml
+++ b/kubernetes/common/mariadb-galera/templates/service.yaml
@@ -18,3 +18,20 @@
 {{ include "common.service" . }}
 ---
 {{ include "common.headlessService" . }}
+{{- if (include "common.onServiceMesh" .) }}
+{{- if eq (default "istio" .Values.global.serviceMesh.engine) "istio" }}
+---
+apiVersion: security.istio.io/v1beta1
+kind: PeerAuthentication
+metadata:
+  name: {{ include "common.servicename" . }}
+  namespace: {{ include "common.namespace" . }}
+spec:
+  selector:
+    matchLabels:
+      app: {{ include "common.servicename" . }}
+  portLevelMtls:
+    {{ .Values.service.internalPort }}:
+      mode: DISABLE
+{{- end}}
+{{- end}}
diff --git a/kubernetes/common/mariadb-galera/templates/statefulset.yaml b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
index 22832c936d..c95b572465 100644
--- a/kubernetes/common/mariadb-galera/templates/statefulset.yaml
+++ b/kubernetes/common/mariadb-galera/templates/statefulset.yaml
@@ -197,12 +197,12 @@ spec:
             - |
               DATA_SOURCE_NAME="$MARIADB_ROOT_USER:$MARIADB_ROOT_PASSWORD@(localhost:3306)/" /bin/mysqld_exporter $MARIADB_METRICS_EXTRA_FLAGS
           ports:
-            - name: metrics
+            - name: tcp-metrics
               containerPort: 9104
           livenessProbe:
             httpGet:
               path: /metrics
-              port: metrics
+              port: tcp-metrics
             initialDelaySeconds: {{ .Values.metrics.livenessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.metrics.livenessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.metrics.livenessProbe.timeoutSeconds }}
@@ -211,7 +211,7 @@ spec:
           readinessProbe:
             httpGet:
               path: /metrics
-              port: metrics
+              port: tcp-metrics
             initialDelaySeconds: {{ .Values.metrics.readinessProbe.initialDelaySeconds }}
             periodSeconds: {{ .Values.metrics.readinessProbe.periodSeconds }}
             timeoutSeconds: {{ .Values.metrics.readinessProbe.timeoutSeconds }}
diff --git a/kubernetes/common/mariadb-galera/values.yaml b/kubernetes/common/mariadb-galera/values.yaml
index 38f3e6e423..d719fb30bd 100644
--- a/kubernetes/common/mariadb-galera/values.yaml
+++ b/kubernetes/common/mariadb-galera/values.yaml
@@ -89,14 +89,14 @@ service:
   headless: {}
   internalPort: &dbPort 3306
   ports:
-    - name: mysql
+    - name: tcp-mysql
       port: *dbPort
   headlessPorts:
-    - name: galera
+    - name: tcp-galera
       port: 4567
-    - name: ist
+    - name: tcp-ist
       port: 4568
-    - name: sst
+    - name: tcp-sst
       port: 4444
 
 
@@ -380,8 +380,12 @@ updateStrategy:
 
 ## Additional pod annotations for MariaDB Galera pods
 ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+## -> here required to enable mariadb-galera in istio
 ##
-podAnnotations: {}
+podAnnotations:
+  #  sidecar.istio.io/inject: "false"
+  traffic.sidecar.istio.io/excludeInboundPorts: "4568"
+  traffic.sidecar.istio.io/includeInboundPorts: '*'
 
 ## Pod affinity preset
 ## ref: https://kubernetes.io/docs/concepts/scheduling-eviction/assign-pod-node/#inter-pod-affinity-and-anti-affinity
@@ -504,14 +508,14 @@ livenessProbe:
   enabled: true
   initialDelaySeconds: 1
   periodSeconds: 10
-  timeoutSeconds: 1
+  timeoutSeconds: 180
   successThreshold: 1
   failureThreshold: 3
 readinessProbe:
   enabled: true
   initialDelaySeconds: 1
   periodSeconds: 10
-  timeoutSeconds: 1
+  timeoutSeconds: 180
   successThreshold: 1
   failureThreshold: 3
 startupProbe:
@@ -520,7 +524,7 @@ startupProbe:
   enabled: true
   initialDelaySeconds: 10
   periodSeconds: 10
-  timeoutSeconds: 1
+  timeoutSeconds: 180
   successThreshold: 1
   # will wait up for initialDelaySeconds + failureThreshold*periodSeconds before
   # stating startup wasn't good (910s per default)
@@ -644,7 +648,7 @@ metrics:
       release: prometheus
 
     ## Rules as a map.
-    rules: {}
+    rules: []
     #  - alert: MariaDB-Down
     #    annotations:
     #      message: 'MariaDB instance {{ $labels.instance }} is down'