From 03078568415225f5ab1b32e4f40063dca520f600 Mon Sep 17 00:00:00 2001
From: kranthikirang <kranthi.guttikonda@b-yond.com>
Date: Fri, 7 Dec 2018 16:12:02 -0500
Subject: Fix nodeSlector and Affinity for aai charts

Indentation problem. Correctly placed nodeSelector and Affinity
aligned with Contrainers in template.spec
common.resources do not need indent as indent 12 already present
in return value

Change-Id: Ie0e84fba2f18d903fdcc8bb8f6ff06a4785c0a75
Issue-ID: OOM-1541
Signed-off-by: Kranthi Guttikonda <kranthi.guttikonda@b-yond.com>
Signed-off-by: kranthikirang <kranthi.guttikonda@b-yond.com>
---
 charts/aai-data-router/templates/deployment.yaml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

(limited to 'charts/aai-data-router/templates')

diff --git a/charts/aai-data-router/templates/deployment.yaml b/charts/aai-data-router/templates/deployment.yaml
index a7ecbce..5c0d9b2 100644
--- a/charts/aai-data-router/templates/deployment.yaml
+++ b/charts/aai-data-router/templates/deployment.yaml
@@ -35,6 +35,14 @@ spec:
         release: {{ .Release.Name }}
       name: {{ include "common.name" . }}
     spec:
+      {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+      {{- end -}}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+      {{- end }}
       initContainers:
       - command:
         - /bin/sh
@@ -120,7 +128,7 @@ spec:
           initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
           periodSeconds: {{ .Values.readiness.periodSeconds }}
         resources:
-{{ include "common.resources" . | indent 12 }}
+{{ include "common.resources" . }}
 
       # side car containers
       - name: filebeat-onap
@@ -136,6 +144,8 @@ spec:
           name: {{ include "common.fullname" . }}-logs
         - mountPath: /usr/share/filebeat/data
           name: aai-filebeat
+        resources:
+{{ include "common.resources" . }}
       volumes:
       - name: localtime
         hostPath:
-- 
cgit 1.2.3-korg