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 --- .../components/awx/components/awx-postgres/values.yaml | 2 +- kubernetes/contrib/components/awx/templates/job.yaml | 13 +++++++++---- kubernetes/contrib/components/awx/values.yaml | 12 ++++++++---- 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml index 4cf03b2482..a6dc5ff90a 100755 --- a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml +++ b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml @@ -75,7 +75,7 @@ persistence: service: type: ClusterIP name: awx-postgresql - portName: awx-postgresql + portName: tcp-postgresql internalPort: 5432 externalPort: 5432 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 diff --git a/kubernetes/contrib/components/awx/values.yaml b/kubernetes/contrib/components/awx/values.yaml index 44c57414a4..c30999fa6d 100755 --- a/kubernetes/contrib/components/awx/values.yaml +++ b/kubernetes/contrib/components/awx/values.yaml @@ -88,22 +88,22 @@ persistence: service: rmqmgmt: type: ClusterIP - portName: rmqmgmt + portName: http-rmqmgmt internalPort: 15672 externalPort: 15672 web: type: ClusterIP - portName: web + portName: http-web internalPort: 8052 externalPort: 8052 rabbitmq: type: ClusterIP http: - portName: http + portName: http-rmq internalPort: 15672 externalPort: 15672 amqp: - portName: amqp + portName: tcp-amqp internalPort: 5672 externalPort: 5672 @@ -114,3 +114,7 @@ serviceAccount: nameOverride: awx roles: - read + +wait_for_job_container: + containers: + - '{{ include "common.name" . }}-mgnt' -- cgit 1.2.3-korg