Add optional annotation for Daemonset and its pods (#10268)

Signed-off-by: kahootali <kahoot.ali@gmail.com>
This commit is contained in:
Ali Kahoot
2018-12-27 10:25:04 -08:00
committed by Kubernetes Prow Robot
parent 2b5d1fabf4
commit 05c0a96dc3
4 changed files with 10 additions and 3 deletions
+1 -1
View File
@@ -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
+1
View File
@@ -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` |
@@ -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" . }}
+2
View File
@@ -67,6 +67,8 @@ livenessProbe:
enabled: true
annotations: {}
podAnnotations: {}
# prometheus.io/scrape: "true"
# prometheus.io/port: "24231"