From 6a5cefa02eaf50e5c782f4b484c3114d93b5427a Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Fri, 29 Apr 2022 09:22:02 +0200 Subject: [AAF] Make AAF ServiceMesh compatible Allthough AAF is not needed for SM it might be required on exceptional cases. In this case the sidecar needs to be disabled for aaf-service and aaf-locate. Additionally the order of chart creation need to be fixed and the job of aaf-sms requires a sidecar killing. Issue-ID: OOM-2820 Signed-off-by: Andreas Geissler Change-Id: I77a2b3da4c826cf294c791bee0d1159233934253 --- kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl') diff --git a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl index 50da519a89..c0614b255e 100644 --- a/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl +++ b/kubernetes/aaf/components/aaf-templates/templates/_deployment.tpl @@ -23,6 +23,10 @@ spec: replicas: {{ .Values.replicaCount }} template: metadata: {{- include "common.templateMetadata" . | nindent 6 }} + {{- if (include "common.onServiceMesh" .) }} + annotations: + sidecar.istio.io/inject: "false" + {{- end }} spec: {{ include "aaf.initContainers" . | nindent 6 }} containers: - name: {{ include "common.name" . }} -- cgit 1.2.3-korg