aboutsummaryrefslogtreecommitdiffstats
path: root/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2021-09-21 11:22:13 +0200
committerMaciej Wereski <m.wereski@partner.samsung.com>2021-11-02 13:48:50 +0100
commitd523d125eb435b5516961aa39329bb5c3fd2d657 (patch)
tree510fc278a71ff3abc7c6f299ecd728a2d871904d /kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
parent82a6aabad85a601a16d5410dbe0a1fc5ebf45d99 (diff)
[AAI] Use log template
Ability to turn off filebeat is needed as it is being deprecated. To achieve that existing log helper template is used. Issue-ID: OOM-1 Signed-off-by: Maciej Wereski <m.wereski@partner.samsung.com> Change-Id: I730b5463fea750594a23ce391c352959d166195e
Diffstat (limited to 'kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml')
-rw-r--r--kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml22
1 files changed, 4 insertions, 18 deletions
diff --git a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
index 610290061f..6de34e9be7 100644
--- a/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
+++ b/kubernetes/aai/components/aai-graphadmin/templates/deployment.yaml
@@ -114,7 +114,7 @@ spec:
name: {{ include "common.fullname" . }}-config
subPath: aaiconfig.properties
- mountPath: /opt/aai/logroot/AAI-RES
- name: {{ include "common.fullname" . }}-logs
+ name: logs
- mountPath: /opt/app/aai-graphadmin/resources/logback.xml
name: {{ include "common.fullname" . }}-config
subPath: logback.xml
@@ -174,29 +174,15 @@ spec:
{{- end }}
# side car containers
- - name: filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- subPath: filebeat.yml
- name: filebeat-conf
- - mountPath: /var/log/onap
- name: {{ include "common.fullname" . }}-logs
- - mountPath: /usr/share/filebeat/data
- name: {{ include "common.fullname" . }}-filebeat
+ {{ include "common.log.sidecar" . | nindent 6 }}
serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
volumes:
- name: localtime
hostPath:
path: /etc/localtime
- - name: filebeat-conf
- configMap:
- name: aai-filebeat
- - name: {{ include "common.fullname" . }}-logs
- emptyDir: {}
- - name: {{ include "common.fullname" . }}-filebeat
+ - name: logs
emptyDir: {}
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 6 }}
- name: {{ include "common.fullname" . }}-config
configMap:
name: {{ include "common.fullname" . }}-configmap