mirror of
https://github.com/bitnami/charts.git
synced 2026-03-16 06:47:30 +08:00
[bitnami/fluentd] Fix some functions for using initScripts (#19226)
* [bitnami/fluentd] Fix initScripts function Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> * [bitnami/fluentd] Bump version Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com> --------- Signed-off-by: Celia Garcia Marquez <gcelia@vmware.com>
This commit is contained in:
@@ -30,4 +30,4 @@ maintainers:
|
|||||||
name: fluentd
|
name: fluentd
|
||||||
sources:
|
sources:
|
||||||
- https://github.com/bitnami/charts/tree/main/bitnami/fluentd
|
- https://github.com/bitnami/charts/tree/main/bitnami/fluentd
|
||||||
version: 5.9.2
|
version: 5.9.3
|
||||||
|
|||||||
@@ -203,4 +203,32 @@ Get the initialization aggregator scripts volume name.
|
|||||||
*/}}
|
*/}}
|
||||||
{{- define "fluentd.aggregator.initScripts" -}}
|
{{- define "fluentd.aggregator.initScripts" -}}
|
||||||
{{- printf "%s-aggregator-init-scripts" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" -}}
|
{{- printf "%s-aggregator-init-scripts" (include "common.names.fullname" .) | trunc 63 | trimSuffix "-" -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the initialization forwarder scripts ConfigMap name.
|
||||||
|
*/}}
|
||||||
|
{{- define "fluentd.forwarder.initScriptsCM" -}}
|
||||||
|
{{- printf "%s" .Values.forwarder.initScriptsCM -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the initialization aggregator scripts ConfigMap name.
|
||||||
|
*/}}
|
||||||
|
{{- define "fluentd.aggregator.initScriptsCM" -}}
|
||||||
|
{{- printf "%s" .Values.aggregator.initScriptsCM -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the initialization forwarder scripts Secret name.
|
||||||
|
*/}}
|
||||||
|
{{- define "fluentd.forwarder.initScriptsSecret" -}}
|
||||||
|
{{- printf "%s" .Values.forwarder.initScriptsSecret -}}
|
||||||
|
{{- end -}}
|
||||||
|
|
||||||
|
{{/*
|
||||||
|
Get the initialization aggregator scripts Secret name.
|
||||||
|
*/}}
|
||||||
|
{{- define "fluentd.aggregator.initScriptsSecret" -}}
|
||||||
|
{{- printf "%s" .Values.aggregator.initScriptsSecret -}}
|
||||||
|
{{- end -}}
|
||||||
|
|||||||
@@ -230,12 +230,12 @@ spec:
|
|||||||
{{- if .Values.aggregator.initScriptsCM }}
|
{{- if .Values.aggregator.initScriptsCM }}
|
||||||
- name: custom-init-scripts-cm
|
- name: custom-init-scripts-cm
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ template ".Values.initScriptsCM" . }}
|
name: {{ template "fluentd.aggregator.initScriptsCM" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.aggregator.initScriptsSecret }}
|
{{- if .Values.aggregator.initScriptsSecret }}
|
||||||
- name: custom-init-scripts-secret
|
- name: custom-init-scripts-secret
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ template ".Values.initScriptsSecret" . }}
|
secretName: {{ template "fluentd.aggregator.initScriptsSecret" . }}
|
||||||
defaultMode: 0755
|
defaultMode: 0755
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|||||||
@@ -224,12 +224,12 @@ spec:
|
|||||||
{{- if .Values.forwarder.initScriptsCM }}
|
{{- if .Values.forwarder.initScriptsCM }}
|
||||||
- name: custom-init-scripts-cm
|
- name: custom-init-scripts-cm
|
||||||
configMap:
|
configMap:
|
||||||
name: {{ template ".Values.initScriptsCM" . }}
|
name: {{ template "fluentd.forwarder.initScriptsCM" . }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- if .Values.forwarder.initScriptsSecret }}
|
{{- if .Values.forwarder.initScriptsSecret }}
|
||||||
- name: custom-init-scripts-secret
|
- name: custom-init-scripts-secret
|
||||||
secret:
|
secret:
|
||||||
secretName: {{ template ".Values.initScriptsSecret" . }}
|
secretName: {{ template "fluentd.forwarder.initScriptsSecret" . }}
|
||||||
defaultMode: 0755
|
defaultMode: 0755
|
||||||
{{- end }}
|
{{- end }}
|
||||||
- name: fluentd-config
|
- name: fluentd-config
|
||||||
|
|||||||
Reference in New Issue
Block a user