Add support for tolerations in helm charts

Author: worr

charts/logging-operator-fluent/README.md

@@ -31,6 +31,7 @@ This chart applies Fluentd and Fluent-bit custom resources to [Logging Operator]
 | `fluentbit.image.tag`                               | Fluentbit container image tag                          | `1.1.3`                       |
 | `fluentbit.image.repository`                        | Fluentbit container image repository                   | `fluent/fluent-bit`            |
 | `fluentbit.image.pullPolicy`                        | Fluentbit container pull policy                        | `IfNotPresent`                 |
+| `fluentbit.tolerations`                             | Fluentbit tolerations                                  | `nil`                          |
 | `fluentd.enabled`                                   | Install fluentd                                        | true                           |
 | `fluentd.namespace`                                 | Specified fluentd installation namespace               | same as operator namespace     |
 | `fluentd.image.tag`                                 | Fluentd container image tag                            | `v1.5.0`                       |
@@ -44,4 +45,5 @@ This chart applies Fluentd and Fluent-bit custom resources to [Logging Operator]
 | `fluentd.configReloaderImage.pullPolicy`            | Fluentd configReloaderImage container pull policy      | `IfNotPresent`                 |
 | `fluentd.fluentdPvcSpec.accessModes`                | Fluentd persistence volume access modes                | `[ReadWriteOnce]`              |
 | `fluentd.fluentdPvcSpec.resources.requests.storage` | Fluentd persistence volume size                        | `21Gi`                         |
+| `fluentd.tolerations`                               | Fluentd tolerations                                    | `nil`                          |
 | `psp.enabled`                                       | Install PodSecurityPolicy                              | `false`                        |

charts/logging-operator-fluent/templates/fluentbit-cr.yaml

@@ -16,8 +16,11 @@ spec:
     prometheus.io/port:   "2020"
   image: {{ toYaml .Values.fluentbit.image | nindent 4 }}
   resources: {}
+  {{- if .Values.fluentbit.tolerations }}
+  tolerations: {{ toYaml .Values.fluentbit.tolerations | nindent 4 }}
+  {{- end }}
   tls:
     enabled: {{ .Values.tls.enabled }}
     secretName: {{ .Values.tls.secretName | default (include "logging-operator-fluent.fullname" .) }}
     sharedKey: {{ .Values.tls.sharedKey | default (derivePassword 1 "long" (.Release.Time | toString) .Release.Name .Chart.Name ) | b64enc | quote }}
-{{ end }}
+{{ end }}

charts/logging-operator-fluent/templates/fluentd-cr.yaml

@@ -19,9 +19,12 @@ spec:
   configReloaderImage: {{ toYaml .Values.fluentd.configReloaderImage | nindent 4 }}
   resources: {}
   fluentdPvcSpec: {{ toYaml .Values.fluentd.fluentdPvcSpec | nindent 4 }}
+  {{- if .Values.fluentd.tolerations }}
+  tolerations: {{ toYaml .Values.fluentd.tolerations | nindent 4 }}
+  {{- end }}
   tls:
     enabled: {{ .Values.tls.enabled }}
     secretName: {{ .Values.tls.secretName | default (include "logging-operator-fluent.fullname" .) }}
     sharedKey: {{ .Values.tls.sharedKey | default (derivePassword 1 "long" (.Release.Time | toString) .Release.Name .Chart.Name ) | b64enc | quote }}
   serviceType: {{ .Values.fluentd.serviceType | default "ClusterIP" | quote }}
-{{ end }}
+{{ end }}

charts/logging-operator-fluent/values.yaml

@@ -10,6 +10,7 @@ tls:
 fluentbit:
   enabled: true
   namespace: ""
+  tolerations:
   image:
     tag: "1.1.3"
     repository: "fluent/fluent-bit"
@@ -30,6 +31,7 @@ fluentd:
     tag: "v0.2.2"
     repository: "jimmidyson/configmap-reload"
     pullPolicy: "IfNotPresent"
+  tolerations:
   fluentdPvcSpec:
     accessModes:
       - ReadWriteOnce