From 70190b319b461982fe80be32e0cf0ad6e615e9b1 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Tue, 12 Jul 2022 09:19:32 +0200 Subject: [CONTRIB] Make AWX ServiceMesh compatibel Changes in the job and service definitions for SM compatibility Issue-ID: OOM-2981 Signed-off-by: Andreas Geissler Change-Id: Ib70baa6a4aedd21e24e339cc724b7f5ea973fdde --- kubernetes/contrib/components/awx/templates/job.yaml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'kubernetes/contrib/components/awx/templates') diff --git a/kubernetes/contrib/components/awx/templates/job.yaml b/kubernetes/contrib/components/awx/templates/job.yaml index f974f446c2..1ebe340a68 100644 --- a/kubernetes/contrib/components/awx/templates/job.yaml +++ b/kubernetes/contrib/components/awx/templates/job.yaml @@ -51,11 +51,16 @@ spec: apiVersion: v1 fieldPath: metadata.namespace containers: - - command: ["/bin/sh","-c"] - args: ["/etc/tower/job-entrypoint.sh"] + - name: {{ include "common.name" . }}-mgnt + command: + - /bin/sh + - -cx + - | + {{- if include "common.onServiceMesh" . }} + echo "waiting 15s for istio side cars to be up"; sleep 15s;{{- end }} + /etc/tower/job-entrypoint.sh image: {{ include "repositoryGenerator.dockerHubRepository" . }}/{{ .Values.image.task }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} - name: {{ include "common.name" . }}-mgnt resources: requests: cpu: 1500m @@ -78,7 +83,7 @@ spec: name: awx-secret-key readOnly: true subPath: SECRET_KEY - + {{ include "common.waitForJobContainer" . | indent 6 | trim }} volumes: - configMap: defaultMode: 0777 -- cgit 1.2.3-korg