From 55e6907b3bac5326fad4274273ffbc594840e6df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20S=C3=A1gi-Kaz=C3=A1r?=
 <sagikazarmark@users.noreply.github.com>
Date: Thu, 8 Feb 2018 07:43:44 +0100
Subject: [PATCH] [stable/fluent-bit] Add configmap override option (#3573)

* [stable/fluent-bit] Add configmap override option

* Rename override value to existingConfigMap

* Drop release name prefix
---
 stable/fluent-bit/Chart.yaml               | 2 +-
 stable/fluent-bit/templates/config.yaml    | 2 ++
 stable/fluent-bit/templates/daemonset.yaml | 2 +-
 stable/fluent-bit/values.yaml              | 6 ++++++
 4 files changed, 10 insertions(+), 2 deletions(-)

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