[incubator/fluentd-cloudwatch] add affinity/nodeselector (helm#10850)

Signed-off-by: ArchiFleKs <[email protected]>
ngealy · Jan 31, 2019 · eba953c · eba953c
1 parent ac99818
commit eba953c
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 2 deletions.
diff --git a/incubator/fluentd-cloudwatch/Chart.yaml b/incubator/fluentd-cloudwatch/Chart.yaml
@@ -1,5 +1,5 @@
 name: fluentd-cloudwatch
-version: 0.6.4
+version: 0.7.0
 appVersion: v0.12.43-cloudwatch
 description: A Fluentd CloudWatch Helm chart for Kubernetes.
 home: https://www.fluentd.org/

diff --git a/incubator/fluentd-cloudwatch/README.md b/incubator/fluentd-cloudwatch/README.md
@@ -68,6 +68,8 @@ The following table lists the configurable parameters of the Fluentd Cloudwatch
 | `tolerations`                   | Add tolerations                                                           | `[]`                                  |
 | `extraVars`                     | Add pod environment variables (must be specified as a single line object) | `[]`                                  |
 | `updateStrategy`                | Define daemonset update strategy                                          | `OnDelete`                            |
+| `nodeSelector`                  | Node labels for pod assignment                                            | `{}`                                  |
+| `affinity`                      | Node affinity for pod assignment                                          | `{}`                                  |
 
 Starting with fluentd-kubernetes-daemonset v0.12.43-cloudwatch, the container runs as user fluentd. To be able to write pos files to the host system, you'll need to run fluentd as root. Add the following extraVars value to run as root.
 

diff --git a/incubator/fluentd-cloudwatch/templates/daemonset.yaml b/incubator/fluentd-cloudwatch/templates/daemonset.yaml
@@ -86,5 +86,13 @@ spec:
       tolerations:
 {{ toYaml .Values.tolerations | indent 6 }}
 {{- end }}
+      {{- if .Values.affinity }}
+      affinity:
+{{ toYaml .Values.affinity | indent 8 }}
+      {{- end }}
+    {{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+    {{- end }}
   updateStrategy:
-{{ toYaml .Values.updateStrategy | indent 4 }}
+{{ toYaml .Values.updateStrategy | indent 4 }}
diff --git a/incubator/fluentd-cloudwatch/values.yaml b/incubator/fluentd-cloudwatch/values.yaml
@@ -19,6 +19,23 @@ resources:
 
 # hostNetwork: false
 
+## Node labels for pod assignment
+## Ref: https://kubernetes.io/docs/user-guide/node-selection/
+##
+nodeSelector: {}
+  # kubernetes.io/role: node
+# Ref: https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.11/#affinity-v1-core
+# Expects input structure as per specification for example:
+#   affinity:
+#     nodeAffinity:
+#      requiredDuringSchedulingIgnoredDuringExecution:
+#        nodeSelectorTerms:
+#        - matchExpressions:
+#          - key: foo.bar.com/role
+#            operator: In
+#            values:
+#            - master
+affinity: {}
 ## Add tolerations if specified
 tolerations: []
 #   - key: node-role.kubernetes.io/master