From a123429d3fdd28e4fb67eb92a03ea2ee802f5c66 Mon Sep 17 00:00:00 2001 From: "David J. M. Karlsen" Date: Mon, 28 Jan 2019 14:58:07 +0100 Subject: [PATCH] [stable/fluent-bit] add support for affinity (#10942) Signed-off-by: David J. M. Karlsen --- stable/fluent-bit/Chart.yaml | 2 +- stable/fluent-bit/README.md | 1 + stable/fluent-bit/templates/daemonset.yaml | 8 ++++++-- stable/fluent-bit/values.yaml | 1 + 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/stable/fluent-bit/Chart.yaml b/stable/fluent-bit/Chart.yaml index 4cd4743f51..42a1c69f89 100755 --- a/stable/fluent-bit/Chart.yaml +++ b/stable/fluent-bit/Chart.yaml @@ -1,5 +1,5 @@ name: fluent-bit -version: 1.3.3 +version: 1.4.0 appVersion: 1.0.3 description: Fast and Lightweight Log/Data Forwarder for Linux, BSD and OSX keywords: diff --git a/stable/fluent-bit/README.md b/stable/fluent-bit/README.md index 25b412c404..ab30c379dd 100644 --- a/stable/fluent-bit/README.md +++ b/stable/fluent-bit/README.md @@ -113,6 +113,7 @@ The following table lists the configurable parameters of the Fluent-Bit chart an | `dnsPolicy` | Specifies the dnsPolicy to use | `ClusterFirst` | | `tolerations` | Optional daemonset tolerations | `NULL` | | `nodeSelector` | Node labels for fluent-bit pod assignment | `NULL` | +| `affinity` | Expressions for affinity | `NULL` | | `metrics.enabled` | Specifies whether a service for metrics should be exposed | `false` | | `metrics.service.annotations` | Optional metrics service annotations | `NULL` | | `metrics.service.port` | Port on where metrics should be exposed | `2020` | diff --git a/stable/fluent-bit/templates/daemonset.yaml b/stable/fluent-bit/templates/daemonset.yaml index b6785f4f6a..ed177442b0 100644 --- a/stable/fluent-bit/templates/daemonset.yaml +++ b/stable/fluent-bit/templates/daemonset.yaml @@ -64,7 +64,7 @@ spec: {{- else }} - name: config mountPath: /fluent-bit/etc/fluent-bit.conf - subPath: fluent-bit.conf + subPath: fluent-bit.conf - name: config mountPath: /fluent-bit/etc/fluent-bit-service.conf subPath: fluent-bit-service.conf @@ -77,7 +77,7 @@ spec: - name: config mountPath: /fluent-bit/etc/fluent-bit-output.conf subPath: fluent-bit-output.conf - + {{- if .Values.parsers.enabled }} - name: config mountPath: /fluent-bit/etc/parsers_custom.conf @@ -106,6 +106,10 @@ spec: nodeSelector: {{ toYaml .Values.nodeSelector | indent 8 }} {{- end }} + {{ if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 8 }} + {{- end }} {{- if .Values.tolerations }} tolerations: {{ toYaml .Values.tolerations | indent 8 }} diff --git a/stable/fluent-bit/values.yaml b/stable/fluent-bit/values.yaml index 2f8d084d33..fde3628389 100644 --- a/stable/fluent-bit/values.yaml +++ b/stable/fluent-bit/values.yaml @@ -176,6 +176,7 @@ tolerations: [] ## Ref: https://kubernetes.io/docs/user-guide/node-selection/ ## nodeSelector: {} +affinity: {} input: tail: