support tpl in extraContainers

fluent · Apr 28, 2024 · 6ebc719 · 6ebc719
1 parent 4298193
commit 6ebc719
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/charts/fluent-bit/Chart.yaml b/charts/fluent-bit/Chart.yaml
@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.46.2
+version: 0.46.3
 appVersion: 3.0.2
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
 home: https://fluentbit.io/

diff --git a/charts/fluent-bit/templates/_pod.tpl b/charts/fluent-bit/templates/_pod.tpl
@@ -119,7 +119,11 @@ containers:
     {{- end }}
 {{- end }}
 {{- if .Values.extraContainers }}
-  {{- toYaml .Values.extraContainers | nindent 2 }}
+  {{- if kindIs "string" .Values.extraContainers }}
+    {{- tpl .Values.extraContainers $ | nindent 2 }}
+  {{- else }}
+    {{-  toYaml .Values.extraContainers | nindent 2 }}
+  {{- end -}}
 {{- end }}
 volumes:
   - name: config

diff --git a/charts/fluent-bit/values.yaml b/charts/fluent-bit/values.yaml
@@ -314,11 +314,21 @@ envWithTpl: []
 
 envFrom: []
 
+# This supports either a structured array or a templatable string
 extraContainers: []
+
+# Array mode
+# extraContainers:
 #   - name: do-something
 #     image: busybox
 #     command: ['do', 'something']
 
+# String mode
+# extraContainers: |-
+#   - name: do-something
+#     image: bitnami/kubectl:{{ .Capabilities.KubeVersion.Major }}.{{ .Capabilities.KubeVersion.Minor }}
+#     command: ['kubectl', 'version']
+
 flush: 1
 
 metricsPort: 2020