[stable/fluentd-elasticsearch] Add nodeSelector support. (#8367)

Also fix values in readme. Signed-off-by: Cédric de Saint Martin <cdesaintmartin@wiremind.fr>
helm · Oct 22, 2018 · 3c76bae · 3c76bae
1 parent 82234c8
commit 3c76bae
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 8 deletions.
diff --git a/stable/fluentd-elasticsearch/Chart.yaml b/stable/fluentd-elasticsearch/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluentd-elasticsearch
-version: 1.0.3
+version: 1.1.0
 appVersion: 2.3.1
 home: https://www.fluentd.org/
 description: A Fluentd Helm chart for Kubernetes with Elasticsearch output

diff --git a/stable/fluentd-elasticsearch/README.md b/stable/fluentd-elasticsearch/README.md
@@ -63,9 +63,10 @@ The following table lists the configurable parameters of the Fluentd elasticsear
 | `resources.requests.memory`        | Memory request                             | `200Mi`                                                    |
 | `service`                          | Service definition                         | `{}`                                                       |
 | `serviceAccount.create`            | Specifies whether a service account should be created.| `true`                                          |
-| `serviceAccount.name`              | Name of the service account.               |                                                            |   
-| `livenessProbe.enabled`            | Whether to enable livenessProbe             | `true`                                                    |   
-| `tolerations`                      | Optional daemonset tolerations             | `NULL`                                                     |
+| `serviceAccount.name`              | Name of the service account.               |                                                            |
+| `livenessProbe.enabled`            | Whether to enable livenessProbe            | `true`                                                     |
+| `tolerations`                      | Optional daemonset tolerations             | `{}`                                                       |
+| `nodeSelector`                     | Optional daemonset nodeSelector            | `{}`                                                       |
 
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,

diff --git a/stable/fluentd-elasticsearch/templates/daemonset.yaml b/stable/fluentd-elasticsearch/templates/daemonset.yaml
@@ -71,12 +71,12 @@ spec:
 {{- if .Values.extraVolumeMounts }}
 {{ toYaml .Values.extraVolumeMounts | indent 8 }}
 {{- end }}
-        ports:          
+        ports:
 {{- range $port := .Values.service.ports }}
           - name: {{ $port.name }}
             containerPort: {{ $port.port }}
-{{- end }}          
-{{- if .Values.livenessProbe.enabled }}       
+{{- end }}
+{{- if .Values.livenessProbe.enabled }}
         # Liveness probe is aimed to help in situarions where fluentd
         # silently hangs for no apparent reasons until manual restart.
         # The idea of this probe is that if fluentd is not queueing or
@@ -109,7 +109,7 @@ spec:
               then
                 exit 1;
               fi;
-{{- end }}              
+{{- end }}
       terminationGracePeriodSeconds: 30
       volumes:
       - name: varlog
@@ -128,6 +128,10 @@ spec:
 {{- if .Values.extraVolumes }}
 {{ toYaml .Values.extraVolumes | indent 6 }}
 {{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
 {{- if .Values.tolerations }}
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}

diff --git a/stable/fluentd-elasticsearch/values.yaml b/stable/fluentd-elasticsearch/values.yaml
@@ -45,6 +45,8 @@ tolerations: {}
   #   operator: Exists
   #   effect: NoSchedule
 
+nodeSelector: {}
+
 service: {}
   # type: ClusterIP
   # ports: