diff options
author | Borislav Glozman <Borislav.Glozman@amdocs.com> | 2019-02-25 10:24:23 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2019-02-25 10:24:23 +0000 |
commit | 03d0e528dadc44118e61773f3dc9d3ab58844573 (patch) | |
tree | f809d0e1686ae22f199a303bf09f95ab73a0ac47 /kubernetes/aai/charts/aai-spike | |
parent | 91a7fd0f6715153591e9ad4608fffb13f004fb9e (diff) | |
parent | cb25a53fd01e135a07505051de4111d34b600b38 (diff) |
Merge "Fix nodeSlector and Affinity for aai charts"
Diffstat (limited to 'kubernetes/aai/charts/aai-spike')
-rw-r--r-- | kubernetes/aai/charts/aai-spike/templates/deployment.yaml | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml index a3ff068971..c962f1df2b 100644 --- a/kubernetes/aai/charts/aai-spike/templates/deployment.yaml +++ b/kubernetes/aai/charts/aai-spike/templates/deployment.yaml @@ -106,15 +106,15 @@ spec: - mountPath: /var/log/onap name: {{ include "common.fullname" . }}-logs resources: -{{ include "common.resources" . | indent 12 }} - {{- if .Values.nodeSelector }} - nodeSelector: -{{ toYaml .Values.nodeSelector | indent 10 }} - {{- end -}} - {{- if .Values.affinity }} - affinity: -{{ toYaml .Values.affinity | indent 10 }} - {{- end }} +{{ include "common.resources" . }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 8 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 8 }} + {{- end }} # side car containers - name: filebeat-onap @@ -128,6 +128,8 @@ spec: name: {{ include "common.fullname" . }}-logs - mountPath: /usr/share/filebeat/data name: aai-filebeat + resources: +{{ include "common.resources" . }} volumes: - name: localtime |