[bitnami/fluentd] Allow annotations for daemonset/statefulset (#3973)

* [bitnami/fluentd] Add forwarder and aggregator annotations

* [bitnami/fluentd] Increment Chart version

* Update README

* [bitnami/fluentd] Update syntax
This commit is contained in:
Charlie
2020-10-14 10:07:33 -04:00
committed by GitHub
parent e901dd8936
commit 9f513960b4
6 changed files with 29 additions and 1 deletions

View File

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

View File

@@ -101,6 +101,7 @@ The following tables lists the configurable parameters of the fluentd chart and
| `forwarder.nodeSelector` | Node labels for pod assignment | `{}` |
| `forwarder.tolerations` | Tolerations for pod assignment | `[]` |
| `forwarder.affinity` | Affinity for pod assignment | `{}` |
| `forwarder.annotations` | Daemonset annotations | `{}` |
| `forwarder.podAnnotations` | Pod annotations | `{}` |
| `forwarder.serviceAccount.create` | Specify whether a ServiceAccount should be created. | `true` |
| `forwarder.serviceAccount.name` | The name of the ServiceAccount to create | Generated using the `fluentd.fullname` template |
@@ -153,6 +154,7 @@ The following tables lists the configurable parameters of the fluentd chart and
| `aggregator.nodeSelector` | Node labels for pod assignment | `{}` |
| `aggregator.tolerations` | Tolerations for pod assignment | `[]` |
| `aggregator.affinity` | Affinity for pod assignment | `{}` |
| `aggregator.annotations` | Statefulset annotations | `{}` |
| `aggregator.podAnnotations` | Pod annotations | `{}` |
| `aggregator.serviceAccount.create` | Specify whether a ServiceAccount should be created. | `false` |
| `aggregator.serviceAccount.name` | The name of the ServiceAccount to create | Generated using the `fluentd.fullname` template |

View File

@@ -3,6 +3,9 @@ apiVersion: apps/v1
kind: StatefulSet
metadata:
name: {{ include "fluentd.fullname" . }}
{{- if .Values.aggregator.annotations }}
annotations: {{- include "fluentd.tplValue" (dict "value" .Values.aggregator.annotations "context" $) | nindent 4 }}
{{- end }}
labels: {{- include "fluentd.labels" . | nindent 4 }}
app.kubernetes.io/component: aggregator
## Istio Labels: https://istio.io/docs/ops/deployment/requirements/

View File

@@ -3,6 +3,9 @@ apiVersion: apps/v1
kind: DaemonSet
metadata:
name: {{ include "fluentd.fullname" . }}
{{- if .Values.forwarder.annotations }}
annotations: {{- include "fluentd.tplValue" (dict "value" .Values.forwarder.annotations "context" $) | nindent 4 }}
{{- end }}
labels: {{- include "fluentd.labels" . | nindent 4 }}
app.kubernetes.io/component: forwarder
## Istio Labels: https://istio.io/docs/ops/deployment/requirements/

View File

@@ -221,6 +221,11 @@ forwarder:
##
affinity: {}
## Annotations for the forwarder
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
annotations: {}
## Pod annotations
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
@@ -447,6 +452,11 @@ aggregator:
##
affinity: {}
## Annotations for the aggregator
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
annotations: {}
## Pod annotations
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##

View File

@@ -221,6 +221,11 @@ forwarder:
##
affinity: {}
## Annotations for the forwarder
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
annotations: {}
## Pod annotations
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
@@ -447,6 +452,11 @@ aggregator:
##
affinity: {}
## Annotations for the aggregator
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##
annotations: {}
## Pod annotations
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
##