diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index 32986a143f..0b267106fc 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,5 +1,5 @@ name: fluent-bit -version: 0.2.7 +version: 0.2.8 appVersion: 0.12.11 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/templates/config.yaml b/stable/fluent-bit/templates/config.yaml index 621184e9ac..a53baa748c 100644 --- a/stable/fluent-bit/templates/config.yaml +++ b/stable/fluent-bit/templates/config.yaml @@ -1,3 +1,4 @@ +{{- if (empty .Values.existingConfigMap) -}} apiVersion: v1 kind: ConfigMap metadata: @@ -59,3 +60,4 @@ data: {{- end }} Format {{ .Values.backend.http.format }} {{- end }} +{{- end -}} diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml index 7a8c95dc7e..f1b5f62720 100644 --- a/stable/fluent-bit/templates/daemonset.yaml +++ b/stable/fluent-bit/templates/daemonset.yaml @@ -51,7 +51,7 @@ spec: path: /var/lib/docker/containers - name: config configMap: - name: {{ template "fluent-bit.fullname" . }}-config + name: {{ if .Values.existingConfigMap }}{{ .Values.existingConfigMap }}{{- else }}{{ template "fluent-bit.fullname" . }}-config{{- end }} {{ if .Values.on_minikube }} - name: mnt hostPath: diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 3f435a4fa7..72bf613507 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -29,6 +29,12 @@ backend: env: [] +## ConfigMap override where fullname is {{.Release.Name}}-{{.Values.existingConfigMap}} +## Defining existingConfigMap will cause templates/config.yaml +## to NOT generate a ConfigMap resource +## +existingConfigMap: "" + resources: limits: memory: 100Mi