Skip to content

Commit 90102cb

Browse files
authored
Make automountServiceAccountToken configurable (#629)
Signed-off-by: Yevhen Ivantsov <yivantsov@atlassian.com>
1 parent 159d7f6 commit 90102cb

File tree

4 files changed

+10
-5
lines changed

4 files changed

+10
-5
lines changed

charts/fluent-bit/Chart.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ keywords:
55
- logging
66
- fluent-bit
77
- fluentd
8-
version: 0.51.0
8+
version: 0.52.0
99
appVersion: 4.0.7
1010
icon: https://raw.githubusercontent.com/cncf/artwork/master/projects/fluentd/fluentbit/icon/fluentbit-icon-color.svg
1111
home: https://fluentbit.io/
@@ -23,6 +23,4 @@ maintainers:
2323
annotations:
2424
artifacthub.io/changes: |
2525
- kind: changed
26-
description: "Update Fluent Bit OCI image to 4.0.7."
27-
- kind: changed
28-
description: "Update ConfigMap Reloader OCI image to 0.15.0."
26+
description: "Add optional automountServiceAccountToken to pod spec and service account"

charts/fluent-bit/templates/_pod.tpl

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
{{- define "fluent-bit.pod" -}}
2+
{{- if ne .Values.serviceAccount.automountServiceAccountToken nil }}
3+
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
4+
{{- end }}
25
serviceAccountName: {{ include "fluent-bit.serviceAccountName" . }}
36
{{- with .Values.imagePullSecrets }}
47
imagePullSecrets:
@@ -139,7 +142,7 @@ volumes:
139142
{{- if or .Values.luaScripts .Values.hotReload.enabled }}
140143
- name: luascripts
141144
configMap:
142-
name: {{ include "fluent-bit.fullname" . }}-luascripts
145+
name: {{ include "fluent-bit.fullname" . }}-luascripts
143146
{{- end }}
144147
{{- if eq .Values.kind "DaemonSet" }}
145148
{{- toYaml .Values.daemonSetVolumes | nindent 2 }}

charts/fluent-bit/templates/serviceaccount.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,7 @@ metadata:
1010
annotations:
1111
{{- toYaml . | nindent 4 }}
1212
{{- end }}
13+
{{- if ne .Values.serviceAccount.automountServiceAccountToken nil }}
14+
automountServiceAccountToken: {{ .Values.serviceAccount.automountServiceAccountToken }}
15+
{{- end }}
1316
{{- end -}}

charts/fluent-bit/values.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ serviceAccount:
3131
create: true
3232
annotations: {}
3333
name:
34+
automountServiceAccountToken:
3435

3536
rbac:
3637
create: true

0 commit comments

Comments
 (0)