From ba1200c2bc0c51411ca49efb17f179441285c215 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Thu, 7 Apr 2022 17:02:59 +0200 Subject: [COMMON][MARIABD] MariaDB ServiceMesh compatibility Update the port names of metrics and mariadb to match the istio requirements and update the timeouts. Fix mysql protocol setup for istio and update mariadb-init job to support istio sidecar communication. This is separated from a patch for CDS SM compatibility Issue-ID: OOM-2820 Signed-off-by: Andreas Geissler Change-Id: I02c19c9fcfbd76a2cede0b924174ad81b45d719e --- kubernetes/common/mariadb-init/templates/job.yaml | 3 +++ 1 file changed, 3 insertions(+) (limited to 'kubernetes/common/mariadb-init/templates/job.yaml') diff --git a/kubernetes/common/mariadb-init/templates/job.yaml b/kubernetes/common/mariadb-init/templates/job.yaml index 96d1dc54a4..e911d46d12 100644 --- a/kubernetes/common/mariadb-init/templates/job.yaml +++ b/kubernetes/common/mariadb-init/templates/job.yaml @@ -59,6 +59,8 @@ spec: - /bin/sh - -c - | + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} /db_init/db_init.sh {{ if or .Values.dbScriptConfigMap .Values.dbScript }} && /db_config/db_cmd.sh{{ end }} env: @@ -91,6 +93,7 @@ spec: {{- end }} resources: {{ include "common.resources" . | indent 12 }} + {{ include "common.waitForJobContainer" . | indent 6 | trim }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} -- cgit 1.2.3-korg