Merge "[COMMON] Add monitoring to postgres"

[oom.git] / 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 50da519..1fb7240 100644 (file)
--- 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" . }}
@@ -54,7 +58,7 @@ spec:
             port: {{ .Values.readiness.port }}
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
-        resources: {{ include "common.resources" . | nindent 12 }}
+        resources: {{ include "common.resources" . | nindent 10 }}
       {{- if .Values.nodeSelector }}
       nodeSelector: {{ toYaml .Values.nodeSelector | nindent 10 }}
       {{- end -}}