Code Review
/
oom.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Update Keystore cert"
[oom.git]
/
kubernetes
/
aai
/
charts
/
aai-modelloader
/
templates
/
deployment.yaml
diff --git
a/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
b/kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
index
38ebe76
..
f34693f
100644
(file)
--- a/
kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
+++ b/
kubernetes/aai/charts/aai-modelloader/templates/deployment.yaml
@@
-1,4
+1,5
@@
-# Copyright © 2017 Amdocs, Bell Canada
+# Copyright © 2018 Amdocs, AT&T
+# Modifications Copyright © 2018 Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@
-34,9
+35,17
@@
spec:
release: {{ .Release.Name }}
name: {{ include "common.name" . }}
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" . }}
containers:
- name: {{ include "common.name" . }}
- image:
{{ .Values.global.repository | default .Values.repository }}/{{ .Values.image }}
+ image:
"{{ include "common.repository" . }}/{{ .Values.image }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CONFIG_HOME
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
env:
- name: CONFIG_HOME
@@
-52,12
+61,14
@@
spec:
name: {{ include "common.fullname" . }}-auth-config
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
name: {{ include "common.fullname" . }}-auth-config
- mountPath: /var/log/onap
name: {{ include "common.fullname" . }}-logs
- - mountPath: /opt/app/model-loader/
bundleconfig/etc/
logback.xml
+ - mountPath: /opt/app/model-loader/logback.xml
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
name: {{ include "common.fullname" . }}-log-conf
subPath: logback.xml
ports:
- containerPort: {{ .Values.service.internalPort }}
- containerPort: {{ .Values.service.internalPort2 }}
+ resources:
+{{ include "common.resources" . }}
# side car containers
- name: filebeat-onap
# side car containers
- name: filebeat-onap
@@
-71,7
+82,8
@@
spec:
name: {{ include "common.fullname" . }}-logs
- mountPath: /usr/share/filebeat/data
name: aai-filebeat
name: {{ include "common.fullname" . }}-logs
- mountPath: /usr/share/filebeat/data
name: aai-filebeat
-
+ resources:
+{{ include "common.resources" . }}
volumes:
- name: localtime
hostPath:
volumes:
- name: localtime
hostPath: