From 9dddcd1d792f326eb7cc1f7e03425062b9598d4b Mon Sep 17 00:00:00 2001 From: Constantin Bugneac Date: Tue, 5 Nov 2019 21:28:39 +0000 Subject: [PATCH] [stable/sumologic-fluentd] Add support for DaemonSet annotations (#17054) (#17055) Signed-off-by: Constantin Bugneac --- stable/sumologic-fluentd/Chart.yaml | 2 +- stable/sumologic-fluentd/README.md | 1 + stable/sumologic-fluentd/templates/daemonset.yaml | 4 ++++ stable/sumologic-fluentd/values.yaml | 3 +++ 4 files changed, 9 insertions(+), 1 deletion(-) diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml index 592ba42fd6..2db2c4438f 100755 --- a/stable/sumologic-fluentd/Chart.yaml +++ b/stable/sumologic-fluentd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: sumologic-fluentd -version: 2.0.0 +version: 2.0.1 appVersion: 2.3.0 kubeVersion: ">=1.10.0-0" description: Sumologic Log Collector diff --git a/stable/sumologic-fluentd/README.md b/stable/sumologic-fluentd/README.md index 64270fae49..2c93e8d7b6 100644 --- a/stable/sumologic-fluentd/README.md +++ b/stable/sumologic-fluentd/README.md @@ -60,6 +60,7 @@ The following table lists the configurable parameters of the sumologic-fluentd c | Parameter | Description | Default | |-----------|-------------|---------| | `podAnnotations` | Annotations to add to the DaemonSet's Pods | `{}` | +| `daemonsetAnnotations` | Annotations to add to the DaemonSet itself | `{}` | | `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | | `nodeSelector` | Node labels for fluentd pod assignment | `{}` | | `affinity` | Expressions for affinity | `{}` | diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml index e594252c90..8037489c1e 100644 --- a/stable/sumologic-fluentd/templates/daemonset.yaml +++ b/stable/sumologic-fluentd/templates/daemonset.yaml @@ -9,6 +9,10 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} +{{- if .Values.daemonsetAnnotations }} + annotations: +{{ toYaml .Values.daemonsetAnnotations | indent 6 }} +{{- end }} spec: selector: matchLabels: diff --git a/stable/sumologic-fluentd/values.yaml b/stable/sumologic-fluentd/values.yaml index 3a39001340..c36d67bd37 100644 --- a/stable/sumologic-fluentd/values.yaml +++ b/stable/sumologic-fluentd/values.yaml @@ -8,6 +8,9 @@ image: podAnnotations: {} # scheduler.alpha.kubernetes.io/tolerations: '[{"key": "example", "value": "foo"}]' +## Annotations to add to the DaemonSet +daemonsetAnnotations: {} + ## Allow the DaemonSet to schedule on tainted nodes (requires Kubernetes >= 1.6) tolerations: [] # - key: node.alpha.kubernetes.io/role