[CONTRIB] Make AWX ServiceMesh compatibel
Changes in the job and service definitions for SM compatibility
Issue-ID: OOM-2981
Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
Change-Id: Ib70baa6a4aedd21e24e339cc724b7f5ea973fdde
diff --git a/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml b/kubernetes/contrib/components/awx/components/awx-postgres/values.yaml
index 4cf03b2..a6dc5ff 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 @@
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 f974f44..1ebe340 100644
--- a/kubernetes/contrib/components/awx/templates/job.yaml
+++ b/kubernetes/contrib/components/awx/templates/job.yaml
@@ -51,11 +51,16 @@
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 @@
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 44c5741..c30999f 100755
--- a/kubernetes/contrib/components/awx/values.yaml
+++ b/kubernetes/contrib/components/awx/values.yaml
@@ -88,22 +88,22 @@
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 @@
nameOverride: awx
roles:
- read
+
+wait_for_job_container:
+ containers:
+ - '{{ include "common.name" . }}-mgnt'