summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/components/multicloud-windriver/templates
diff options
context:
space:
mode:
authorMaciej Wereski <m.wereski@partner.samsung.com>2021-11-17 16:45:14 +0100
committerMaciej Wereski <m.wereski@partner.samsung.com>2021-11-17 16:45:14 +0100
commit989c91ca903c686837fe890b76b2b6dd94b0f077 (patch)
tree95ff0ed798e6c9cd485d278786c2042b40d52702 /kubernetes/multicloud/components/multicloud-windriver/templates
parent4eb609904c7882b95ff1122b911bbe42feaaee21 (diff)
[MULTICLOUD] 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: I22bcac642e1f9607dc4e65e2b8b34c946b3c29cb
Diffstat (limited to 'kubernetes/multicloud/components/multicloud-windriver/templates')
-rw-r--r--kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml20
1 files changed, 3 insertions, 17 deletions
diff --git a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
index f46e45017d..dfb4bbc98c 100644
--- a/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-windriver/templates/deployment.yaml
@@ -69,7 +69,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: windriver-log
- mountPath: /opt/windriver/titanium_cloud/pub/config/log.yml
name: windriver-logconfig
@@ -96,17 +96,7 @@ spec:
failureThreshold: {{ .Values.liveness.failureThreshold }}
{{ end }}
# side car containers
- - image: {{ include "repositoryGenerator.image.logging" . }}
- imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: filebeat-onap
- volumeMounts:
- - mountPath: /usr/share/filebeat/filebeat.yml
- name: filebeat-conf
- subPath: filebeat.yml
- - mountPath: /var/log/onap
- name: windriver-log
- - mountPath: /usr/share/filebeat/data
- name: windriver-data-filebeat
+ {{ include "common.log.sidecar" . | nindent 7 }}
- image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.global.artifactImage }}
name: framework-artifactbroker
command: ["/opt/app/distribution/bin/artifact-dist.sh"]
@@ -124,11 +114,7 @@ spec:
volumes:
- name: windriver-log
emptyDir: {}
- - name: windriver-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 7 }}
- name: windriver-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap