feat(fluent-bit): Add automountServiceAccountToken override at pod level

charts/fluent-bit/Chart.yaml

@@ -5,7 +5,7 @@ keywords:
   - logging
   - fluent-bit
   - fluentd
-version: 0.54.0
+version: 0.55.0
 appVersion: 4.1.0
 icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
 home: https://fluentbit.io/
@@ -22,5 +22,9 @@ maintainers:
     email: steve.hipwell@gmail.com
 annotations:
   artifacthub.io/changes: |
-    - kind: changed
-      description: "Update Fluent Bit OCI image to 4.1.0."
+    - kind: deprecated
+      description: "Deprecated serviceAccount.automountServiceAccountToken (use serviceAccount.automountToken instead)"
+    - kind: added
+      description: "Added support for serviceAccount.automountToken to service account and pod spec"
+    - kind: added
+      description: "Added support for automountServiceAccountToken (pod-level override) to pod spec"

charts/fluent-bit/templates/_pod.tpl

@@ -1,5 +1,7 @@
 {{- define "fluent-bit.pod" -}}
-{{- if ne .Values.serviceAccount.automountServiceAccountToken nil }}
+{{- if ne .Values.automountServiceAccountToken nil }}
+automountServiceAccountToken: {{ .Values.automountServiceAccountToken }}
+{{- else if ne .Values.serviceAccount.automountServiceAccountToken nil }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}
 serviceAccountName: {{ include "fluent-bit.serviceAccountName" . }}

charts/fluent-bit/templates/serviceaccount.yaml

@@ -10,7 +10,9 @@ metadata:
   annotations:
     {{- toYaml . | nindent 4 }}
   {{- end }}
-{{- if ne .Values.serviceAccount.automountServiceAccountToken nil }}
+{{- if ne .Values.serviceAccount.automountToken nil }}
+automountServiceAccountToken: {{ .Values.serviceAccount.automountToken }}
+{{- else if ne .Values.serviceAccount.automountServiceAccountToken nil }}
 automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
 {{- end }}
 {{- end -}}

charts/fluent-bit/values.yaml

@@ -31,7 +31,18 @@ serviceAccount:
   create: true
   annotations: {}
   name:
+  # DEPRECATED: use serviceAccount.automountToken instead
   automountServiceAccountToken:
+  # Automatically mount the ServiceAccount token
+  # on *all* pods using this ServiceAccount unless
+  # they explicitly opt out.
+  automountToken:
+
+# Automatically mount the ServiceAccount token
+# on the Fluent Bit pod(s).  NOTE: This setting
+# overrides serviceAccount.automountToken for
+# the Fluent Bit pod(s).
+automountServiceAccountToken:
 
 rbac:
   create: true