From c6c091af43df962e8aab4c14083023323899cf20 Mon Sep 17 00:00:00 2001 From: Frank Reno Date: Thu, 27 Jun 2019 15:13:46 -0600 Subject: [PATCH] =?UTF-8?q?Add=20support=20to=20configure=20affinity=20and?= =?UTF-8?q?=20nodeSelector.=20Signed-off-by=E2=80=A6=20(#13129)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Add support to configure `affinity` and `nodeSelector`. Signed-off-by: Frank Reno Signed-off-by: Frank Reno * update version. Signed-off-by: Frank Reno * fix alignment Signed-off-by: Frank Reno --- stable/sumologic-fluentd/Chart.yaml | 2 +- stable/sumologic-fluentd/README.md | 2 ++ stable/sumologic-fluentd/templates/daemonset.yaml | 10 +++++++++- stable/sumologic-fluentd/values.yaml | 6 ++++++ 4 files changed, 18 insertions(+), 2 deletions(-) diff --git a/stable/sumologic-fluentd/Chart.yaml b/stable/sumologic-fluentd/Chart.yaml index ba33e1adf4..1cfc1bf392 100755 --- a/stable/sumologic-fluentd/Chart.yaml +++ b/stable/sumologic-fluentd/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: sumologic-fluentd -version: 1.0.0 +version: 1.1.0 appVersion: 2.3.0 description: Sumologic Log Collector keywords: diff --git a/stable/sumologic-fluentd/README.md b/stable/sumologic-fluentd/README.md index 0b5f819d83..9b0f4101ca 100644 --- a/stable/sumologic-fluentd/README.md +++ b/stable/sumologic-fluentd/README.md @@ -61,6 +61,8 @@ The following table lists the configurable parameters of the sumologic-fluentd c |-----------|-------------|---------| | `podAnnotations` | Annotations to add to the DaemonSet's Pods | `{}` | | `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | +| `nodeSelector` | Node labels for fluentd pod assignment | `{}` | +| `affinity` | Expressions for affinity | `{}` | | `extraEnv` | List of additional env vars to append to pods | `[]` | | `updateStrategy` | `OnDelete` or `RollingUpdate` (requires Kubernetes >= 1.6) | `OnDelete` | | `sumologic.collectorUrl` | An HTTP collector in SumoLogic that the container can send logs to via HTTP | `Nil` You must provide your own value | diff --git a/stable/sumologic-fluentd/templates/daemonset.yaml b/stable/sumologic-fluentd/templates/daemonset.yaml index 0ef934f867..810f916e20 100644 --- a/stable/sumologic-fluentd/templates/daemonset.yaml +++ b/stable/sumologic-fluentd/templates/daemonset.yaml @@ -229,7 +229,15 @@ spec: {{- end }} {{- if .Values.tolerations }} tolerations: -{{ toYaml .Values.tolerations | indent 8 }} + {{ toYaml .Values.tolerations | indent 8 }} + {{- end }} + {{- if .Values.nodeSelector }} + nodeSelector: + {{ toYaml .Values.nodeSelector | indent 8 }} + {{- end }} + {{ if .Values.affinity }} + affinity: + {{ toYaml .Values.affinity | indent 8 }} {{- end }} updateStrategy: type: "{{ .Values.updateStrategy }}" diff --git a/stable/sumologic-fluentd/values.yaml b/stable/sumologic-fluentd/values.yaml index f09a258c9b..3328ff053b 100644 --- a/stable/sumologic-fluentd/values.yaml +++ b/stable/sumologic-fluentd/values.yaml @@ -14,6 +14,12 @@ tolerations: [] # effect: NoSchedule # operator: "Exists" +## Node labels for fluentd pod assignment +nodeSelector: {} + +## Expressions for affinity +affinity: {} + # Extra environment variables to set for fluentd extraEnv: []