[bitnami/fluentd] Add ServiceAccount annotations (#3390)

* [bitnami/fluentd] Add ServiceAccount annotations (#3389)

* Update to use `fluentd.tplValue`

Based on request from @dani8art
This commit is contained in:
Mate Farkas
2020-08-12 15:54:04 +01:00
committed by GitHub
parent 2f2e1ddcc5
commit ddf2c9e2a7
5 changed files with 12 additions and 2 deletions

View File

@@ -1,6 +1,6 @@
apiVersion: v1
name: fluentd
version: 1.2.11
version: 1.3.0
appVersion: 1.11.2
description: Fluentd is an open source data collector for unified logging layer
keywords:

View File

@@ -140,6 +140,7 @@ The following tables lists the configurable parameters of the fluentd chart and
| `aggregator.podAnnotations` | Pod annotations | `{}` |
| `serviceAccount.create` | Specify whether a ServiceAccount should be created | `true` |
| `serviceAccount.name` | The name of the ServiceAccount to create | Generated using the `fluentd.fullname` template |
| `serviceAccount.annotations` | Additional Service Account annotations (evaluated as a template) | `{}` |
| `rbac.create` | Specify whether RBAC resources should be created and used | `true` |
| `metrics.enabled` | Enable the export of Prometheus metrics | `nil` |
| `metrics.service.type` | Prometheus metrics service type | `ClusterIP` |

View File

@@ -4,4 +4,7 @@ kind: ServiceAccount
metadata:
name: {{ include "fluentd.serviceAccountName" . }}
labels: {{- include "fluentd.labels" . | nindent 4 }}
{{- end -}}
{{- if .Values.serviceAccount.annotations }}
annotations: {{- include "fluentd.tplValue" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }}
{{- end }}
{{- end -}}

View File

@@ -407,6 +407,9 @@ serviceAccount:
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fluentd.fullname template
# name:
## Annotations for the Service Account (evaluated as a template)
##
annotations: {}
## Role Based Access
## ref: https://kubernetes.io/docs/admin/authorization/rbac/

View File

@@ -407,6 +407,9 @@ serviceAccount:
## The name of the ServiceAccount to use.
## If not set and create is true, a name is generated using the fluentd.fullname template
# name:
## Annotations for the Service Account (evaluated as a template)
##
annotations: {}
## Role Based Access
## ref: https://kubernetes.io/docs/admin/authorization/rbac/