aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/charts/aai-modelloader
diff options
context:
space:
mode:
authorBorislav Glozman <Borislav.Glozman@amdocs.com>2019-02-25 10:24:23 +0000
committerGerrit Code Review <gerrit@onap.org>2019-02-25 10:24:23 +0000
commit03d0e528dadc44118e61773f3dc9d3ab58844573 (patch)
treef809d0e1686ae22f199a303bf09f95ab73a0ac47 /kubernetes/aai/charts/aai-modelloader
parent91a7fd0f6715153591e9ad4608fffb13f004fb9e (diff)
parentcb25a53fd01e135a07505051de4111d34b600b38 (diff)
Merge "Fix nodeSlector and Affinity for aai charts"
Diffstat (limited to 'kubernetes/aai/charts/aai-modelloader')
-rw-r--r--kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml12
1 files changed, 11 insertions, 1 deletions
diff --git a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index 3a81168caf..f34693fd44 100644
--- a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-modelloader/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 }}
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
@@ -60,7 +68,7 @@ spec:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
resources:
-{{ include "common.resources" . | indent 12 }}
+{{ include "common.resources" . }}
# side car containers
- name: filebeat-onap
@@ -74,6 +82,8 @@ spec:
name: {{ include "common.fullname" . }}-logs
- mountPath: /usr/share/filebeat/data
name: aai-filebeat
+ resources:
+{{ include "common.resources" . }}
volumes:
- name: localtime
hostPath: