summaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/templates/modelloader-deployment.yaml
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2017-10-05 18:39:40 +0000
committerGerrit Code Review <gerrit@onap.org>2017-10-05 18:39:40 +0000
commit97a44f0edbec1b47934c229c895e29e1a5973add (patch)
treef9430a7c9f5cb5b982c767afce72fdb19060bfbe /kubernetes/aai/templates/modelloader-deployment.yaml
parent0e2770217c4bd5e80f9ab64c6c88026526930df4 (diff)
parentb2b99184fe715d28c06c89c95006f6edf30dbfad (diff)
Merge "Add missing aai canonical logging"
Diffstat (limited to 'kubernetes/aai/templates/modelloader-deployment.yaml')
-rw-r--r--kubernetes/aai/templates/modelloader-deployment.yaml43
1 files changed, 36 insertions, 7 deletions
diff --git a/kubernetes/aai/templates/modelloader-deployment.yaml b/kubernetes/aai/templates/modelloader-deployment.yaml
index 22b72815cb..3f2bda3d6c 100644
--- a/kubernetes/aai/templates/modelloader-deployment.yaml
+++ b/kubernetes/aai/templates/modelloader-deployment.yaml
@@ -14,7 +14,10 @@ spec:
name: model-loader-service
spec:
containers:
- - env:
+ - name: model-loader-service
+ image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ env:
- name: CONFIG_HOME
value: /opt/app/model-loader/config/
volumeMounts:
@@ -23,14 +26,24 @@ spec:
readOnly: true
- mountPath: /opt/app/model-loader/config/
name: aai-model-loader-config
- - mountPath: /logs/
+ - mountPath: /var/log/onap
name: aai-model-loader-logs
- image: "{{ .Values.image.modelLoaderImage }}:{{ .Values.image.modelLoaderVersion }}"
- imagePullPolicy: {{ .Values.pullPolicy }}
- name: model-loader-service
+ - mountPath: /opt/app/model-loader/bundleconfig/etc/logback.xml
+ name: aai-model-loader-log-conf
+ subPath: logback.xml
ports:
- containerPort: 8080
- containerPort: 8443
+ - name: filebeat-onap-aai-model-loader
+ image: {{ .Values.image.filebeat }}
+ imagePullPolicy: {{ .Values.pullPolicy }}
+ volumeMounts:
+ - mountPath: /usr/share/filebeat/filebeat.yml
+ name: filebeat-conf
+ - mountPath: /var/log/onap
+ name: aai-model-loader-logs
+ - mountPath: /usr/share/filebeat/data
+ name: aai-model-loader-filebeat
volumes:
- name: localtime
hostPath:
@@ -38,9 +51,25 @@ spec:
- name: aai-model-loader-config
hostPath:
path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
- - name: aai-model-loader-logs
+ - name: filebeat-conf
hostPath:
- path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/logs/"
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ - name: aai-model-loader-logs
+ emptyDir: {}
+ - name: aai-model-loader-filebeat
+ emptyDir: {}
+ - name: aai-model-loader-log-conf
+ configMap:
+ name: aai-model-loader-configmap
restartPolicy: Always
imagePullSecrets:
- name: "{{ .Values.nsPrefix }}-docker-registry-key"
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: aai-model-loader-configmap
+ namespace: {{ .Values.nsPrefix }}-aai
+data:
+{{ (.Files.Glob "resources/model-loader/conf/logback.xml").AsConfig | indent 2 }}
+