summaryrefslogtreecommitdiffstats
path: root/kubernetes/multicloud/components/multicloud-starlingx
diff options
context:
space:
mode:
authorSylvain Desbureaux <sylvain.desbureaux@orange.com>2021-11-30 13:44:00 +0000
committerGerrit Code Review <gerrit@onap.org>2021-11-30 13:44:00 +0000
commit188e897b9d477f589033a4fc14ddbb1b9260cd35 (patch)
treebc449fde6695059060f45850a23cf277a61c44fa /kubernetes/multicloud/components/multicloud-starlingx
parent8d304a4c6c6a1c0679c41aa6a51ad6fa60f7d391 (diff)
parent989c91ca903c686837fe890b76b2b6dd94b0f077 (diff)
Merge "[MULTICLOUD] Use log template"
Diffstat (limited to 'kubernetes/multicloud/components/multicloud-starlingx')
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml20
-rw-r--r--kubernetes/multicloud/components/multicloud-starlingx/values.yaml5
2 files changed, 8 insertions, 17 deletions
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
index 7c39bb7006..c9209a0c09 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/templates/deployment.yaml
@@ -60,7 +60,7 @@ spec:
value: "{{ .Values.config.ssl_enabled }}"
name: {{ include "common.name" . }}
volumeMounts:
- - mountPath: /var/log/onap
+ - mountPath: "{{ .Values.log.path }}"
name: starlingx-log
- mountPath: /opt/starlingx/starlingx/pub/config/log.yml
name: starlingx-logconfig
@@ -87,17 +87,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: starlingx-log
- - mountPath: /usr/share/filebeat/data
- name: starlingx-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"]
@@ -115,11 +105,7 @@ spec:
volumes:
- name: starlingx-log
emptyDir: {}
- - name: starlingx-data-filebeat
- emptyDir: {}
- - name: filebeat-conf
- configMap:
- name: multicloud-filebeat-configmap
+ {{ include "common.log.volumes" (dict "dot" . "configMapNamePrefix" (tpl .Values.logConfigMapNamePrefix . )) | nindent 7 }}
- name: starlingx-logconfig
configMap:
name: {{ include "common.fullname" . }}-log-configmap
diff --git a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
index 69e4d943bd..f18a090dba 100644
--- a/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
+++ b/kubernetes/multicloud/components/multicloud-starlingx/values.yaml
@@ -94,3 +94,8 @@ serviceAccount:
nameOverride: multicloud-starlingx
roles:
- read
+
+#Log configuration
+log:
+ path: /var/log/onap
+logConfigMapNamePrefix: '{{ include "common.fullname" . }}'