summaryrefslogtreecommitdiffstats
path: root/kubernetes/portal/components/portal-sdk/templates
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-11-22 08:26:05 +0000
committerGerrit Code Review <gerrit@onap.org>2021-11-22 08:26:05 +0000
commitfbab601b5119796d41c9e1c01cc2d451f5da517b (patch)
treef4e4d9cecf1a75ff0949458f6bdab525e1ca7681 /kubernetes/portal/components/portal-sdk/templates
parent4eb609904c7882b95ff1122b911bbe42feaaee21 (diff)
parentd5d4a852c0f3255e7578c81ddf1b53ccea5552eb (diff)
Merge "[PORTAL] Use log template"
Diffstat (limited to 'kubernetes/portal/components/portal-sdk/templates')
-rw-r--r--kubernetes/portal/components/portal-sdk/templates/deployment.yaml20
1 files changed, 3 insertions, 17 deletions
diff --git a/kubernetes/portal/components/portal-sdk/templates/deployment.yaml b/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
index 95247b3dd2..abc5daab80 100644
--- a/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
+++ b/kubernetes/portal/components/portal-sdk/templates/deployment.yaml
@@ -149,7 +149,7 @@ spec:
- name: portal-tomcat-logs
mountPath: "{{ .Values.global.env.tomcatDir }}/logs"
- name: var-log-onap
- mountPath: /var/log/onap
+ mountPath: "{{ .Values.log.path }}"
resources:
{{ include "common.resources" . }}
{{- if .Values.nodeSelector }}
@@ -160,17 +160,7 @@ spec:
affinity:
{{ toYaml .Values.affinity | indent 10 }}
{{- end }}
- - name: filebeat-onap
- image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - name: portal-data-filebeat
- mountPath: /usr/share/filebeat/data
- - name: var-log-onap
- mountPath: /var/log/onap
+ {{ include "common.log.sidecar" . | nindent 6 }}
volumes:
- name: localtime
hostPath:
@@ -182,13 +172,9 @@ spec:
configMap:
name: {{ include "common.fullname" . }}-onapportalsdk
defaultMode: 0755
- - name: filebeat-conf
- configMap:
- name: portal-filebeat
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix .)) | nindent 8 }}
- name: var-log-onap
emptyDir: {}
- - name: portal-data-filebeat
- emptyDir: {}
- name: portal-tomcat-logs
emptyDir: {}
{{ include "common.certInitializer.volumes" . | indent 8 }}