From: Alexis de Talhouët <alexis.de_talhouet@bell.ca>
Date: Mon, 26 Nov 2018 13:55:21 +0000 (+0000)
Subject: Merge "resources are always set"
X-Git-Tag: 3.0.0-ONAP~8
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=7cf46293cb660c9f025c577dacd318777b4f6475;hp=39b7c5e0ff4098fdc4f2004e6e990004c74a97c7;p=oom.git

Merge "resources are always set"
---

diff --git a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
index ca8498b8aa..a7daa05143 100644
--- a/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
+++ b/kubernetes/appc/charts/appc-ansible-server/templates/deployment.yaml
@@ -75,8 +75,8 @@ spec:
             name: config
             subPath: RestServer_config
           resources:
-        {{- if .Values.nodeSelector }}
 {{ include "common.resources" . | indent 12 }}
+        {{- if .Values.nodeSelector }}
         nodeSelector:
 {{ toYaml .Values.nodeSelector | indent 10 }}
         {{- end -}}