diff options
| author |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-10-31 07:49:14 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-31 07:49:14 +0000 |
| commit | a0af60aad20b8d372c21854c0ead5f484fa22d44 (patch) | |
| tree | 40ddd5750064a87cee50b13776bdcffc4507c832 /kubernetes | |
| parent | a9cee9a17d5f7ca3bc585e29fefcbe071e07a905 (diff) | |
| parent | 77ecf276763ba23eddcd05bedefed3b6da3bd7ea (diff) | |
Merge "[COMMON] Log: add ability to set ConfigMap name in volumes"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/common/common/templates/_log.tpl | 6 |
1 files changed, 4 insertions, 2 deletions
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 -}} |