From 304530c9f06b618b4a66589bd831b26e43c66ee0 Mon Sep 17 00:00:00 2001
From: Michael McLeroy <michaelmcleroy@cloudfitsoftware.com>
Date: Thu, 1 Jun 2023 18:22:45 -0400
Subject: [PATCH] feat(fluentd): use tini; add override for entrypoint

Signed-off-by: Michael McLeroy <michaelmcleroy@cloudfitsoftware.com>
---
 charts/fluentd/Chart.yaml         | 2 +-
 charts/fluentd/templates/_pod.tpl | 6 +++---
 charts/fluentd/values.yaml        | 4 ++++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/charts/fluentd/Chart.yaml b/charts/fluentd/Chart.yaml
index e3a6fa6a..f19fa1a5 100644
--- a/charts/fluentd/Chart.yaml
+++ b/charts/fluentd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: fluentd
 description: A Helm chart for Kubernetes
 # type: application
-version: 0.4.3
+version: 0.4.4
 appVersion: v1.15.2
 icon: https://www.fluentd.org/images/miscellany/fluentd-logo_2x.png
 home: https://www.fluentd.org/
diff --git a/charts/fluentd/templates/_pod.tpl b/charts/fluentd/templates/_pod.tpl
index f77fb2f8..5de10ca2 100644
--- a/charts/fluentd/templates/_pod.tpl
+++ b/charts/fluentd/templates/_pod.tpl
@@ -23,16 +23,16 @@ containers:
       {{- toYaml .Values.securityContext | nindent 6 }}
     image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default $defaultTag }}"
     imagePullPolicy: {{ .Values.image.pullPolicy }}
-  {{- if .Values.plugins }}
     command:
+    - "tini"
+    - "--"
     - "/bin/sh"
     - "-c"
     - |
       {{- range $plugin := .Values.plugins }}
         {{- print "fluent-gem install " $plugin | nindent 6 }}
       {{- end }}
-      exec /fluentd/entrypoint.sh
-  {{- end }}
+      exec {{ .Values.podEntrypoint }}
     env:
     - name: FLUENTD_CONF
       value: "../../../etc/fluent/fluent.conf"
diff --git a/charts/fluentd/values.yaml b/charts/fluentd/values.yaml
index b9ac8d98..e664f347 100644
--- a/charts/fluentd/values.yaml
+++ b/charts/fluentd/values.yaml
@@ -145,6 +145,10 @@ podAnnotations: {}
 ##
 podLabels: {}
 
+## Entrypoint to call for fluentd pods
+##
+podEntrypoint: /fluentd/entrypoint.sh
+
 ## How long (in seconds) a pods needs to be stable before progressing the deployment
 ##
 minReadySeconds: