diff --git a/bitnami/fluentd/Chart.yaml b/bitnami/fluentd/Chart.yaml index d505e98b9a..d8d5133d7d 100644 --- a/bitnami/fluentd/Chart.yaml +++ b/bitnami/fluentd/Chart.yaml @@ -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: diff --git a/bitnami/fluentd/README.md b/bitnami/fluentd/README.md index 111dc2fb45..20a4889300 100644 --- a/bitnami/fluentd/README.md +++ b/bitnami/fluentd/README.md @@ -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` | diff --git a/bitnami/fluentd/templates/serviceaccount.yaml b/bitnami/fluentd/templates/serviceaccount.yaml index 1e5847591e..3542abbc92 100644 --- a/bitnami/fluentd/templates/serviceaccount.yaml +++ b/bitnami/fluentd/templates/serviceaccount.yaml @@ -4,4 +4,7 @@ kind: ServiceAccount metadata: name: {{ include "fluentd.serviceAccountName" . }} labels: {{- include "fluentd.labels" . | nindent 4 }} -{{- end -}} \ No newline at end of file + {{- if .Values.serviceAccount.annotations }} + annotations: {{- include "fluentd.tplValue" (dict "value" .Values.serviceAccount.annotations "context" $) | nindent 4 }} + {{- end }} +{{- end -}} diff --git a/bitnami/fluentd/values-production.yaml b/bitnami/fluentd/values-production.yaml index 61328a1adb..8b47d6df00 100644 --- a/bitnami/fluentd/values-production.yaml +++ b/bitnami/fluentd/values-production.yaml @@ -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/ diff --git a/bitnami/fluentd/values.yaml b/bitnami/fluentd/values.yaml index fc64c54e73..98e5720395 100644 --- a/bitnami/fluentd/values.yaml +++ b/bitnami/fluentd/values.yaml @@ -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/