diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml index eddfd10e87..aeb7d03823 100644 --- a/stable/fluentd-elasticsearch/Chart.yaml +++ b/stable/fluentd-elasticsearch/Chart.yaml @@ -1,5 +1,5 @@ name: fluentd-elasticsearch -version: 2.0.2 +version: 2.0.3 appVersion: 2.3.2 home: https://www.fluentd.org/ description: A Fluentd Helm chart for Kubernetes with Elasticsearch output diff --git a/stable/fluentd-elasticsearch/README.md b/stable/fluentd-elasticsearch/README.md index 3443179f3f..e90ab0f3bc 100644 --- a/stable/fluentd-elasticsearch/README.md +++ b/stable/fluentd-elasticsearch/README.md @@ -46,6 +46,7 @@ The following table lists the configurable parameters of the Fluentd elasticsear | Parameter | Description | Default | | ---------------------------------- | ------------------------------------------ | ---------------------------------------------------------- | | `annotations` | Optional daemonset annotations | `NULL` | +| `podAnnotations` | Optional daemonset's pods annotations | `NULL` | | `configMaps` | Fluentd configmaps | `default conf files` | | `elasticsearch.host` | Elasticsearch Host | `elasticsearch-client` | | `elasticsearch.port` | Elasticsearch Port | `9200` | diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml index b0a67330f1..0529205e38 100644 --- a/stable/fluentd-elasticsearch/templates/daemonset.yaml +++ b/stable/fluentd-elasticsearch/templates/daemonset.yaml @@ -9,6 +9,10 @@ metadata: app.kubernetes.io/managed-by: {{ .Release.Service }} kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile +{{- if .Values.annotations }} + annotations: +{{ toYaml .Values.annotations | indent 4 }} +{{- end }} spec: updateStrategy: {{ toYaml .Values.updateStrategy | indent 4 }} @@ -30,8 +34,8 @@ spec: annotations: scheduler.alpha.kubernetes.io/critical-pod: '' checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} -{{- if .Values.annotations }} -{{ toYaml .Values.annotations | indent 8 }} +{{- if .Values.podAnnotations }} +{{ toYaml .Values.podAnnotations | indent 8 }} {{- end }} spec: serviceAccountName: {{ template "fluentd-elasticsearch.fullname" . }} diff --git a/stable/fluentd-elasticsearch/values.yaml b/stable/fluentd-elasticsearch/values.yaml index 510628262f..27622bbb54 100644 --- a/stable/fluentd-elasticsearch/values.yaml +++ b/stable/fluentd-elasticsearch/values.yaml @@ -67,6 +67,8 @@ livenessProbe: enabled: true annotations: {} + +podAnnotations: {} # prometheus.io/scrape: "true" # prometheus.io/port: "24231"