From: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Date: Sun, 31 Oct 2021 07:49:14 +0000 (+0000)
Subject: Merge "[COMMON] Log: add ability to set ConfigMap name in volumes"
X-Git-Tag: 9.0.0~48
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a0af60aad20b8d372c21854c0ead5f484fa22d44;hp=a9cee9a17d5f7ca3bc585e29fefcbe071e07a905;p=oom.git

Merge "[COMMON] Log: add ability to set ConfigMap name in volumes"
---

diff --git a/kubernetes/common/common/templates/_log.tpl b/kubernetes/common/common/templates/_log.tpl
index dc714aecc4..81420468b0 100644
--- a/kubernetes/common/common/templates/_log.tpl
+++ b/kubernetes/common/common/templates/_log.tpl
@@ -31,10 +31,12 @@
 {{- end -}}
 
 {{- define "common.log.volumes" -}}
-{{- if .Values.global.centralizedLoggingEnabled }}
+{{- $dot := default . .dot }}
+{{- if $dot.Values.global.centralizedLoggingEnabled }}
+{{- $configMapName := printf "%s-filebeat" (default (include "common.fullname" $dot) .configMapNamePrefix) }}
 - name: filebeat-conf
   configMap:
-    name: {{ include "common.fullname" . }}-filebeat
+    name: {{ $configMapName }}
 - name: filebeat-data
   emptyDir: {}
 {{- end -}}