Ability to specify Consul client daemonset affinity.

nehrman · Oct 15, 2019 · 06b0ca0 · 06b0ca0
1 parent 24d3115
commit 06b0ca0
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 0 deletions.
diff --git a/templates/client-daemonset.yaml b/templates/client-daemonset.yaml
@@ -32,6 +32,10 @@ spec:
           {{- tpl .Values.client.annotations . | nindent 8 }}
         {{- end }}
     spec:
+    {{- if .Values.client.affinity }}
+      affinity:
+        {{ tpl .Values.client.affinity . | nindent 8 | trim }}
+    {{- end }}
     {{- if .Values.client.tolerations }}
       tolerations:
         {{ tpl .Values.client.tolerations . | nindent 8 | trim }}

diff --git a/test/unit/client-daemonset.bats b/test/unit/client-daemonset.bats
@@ -243,6 +243,28 @@ load _helpers
   [ "${actual}" = "testing" ]
 }
 
+#--------------------------------------------------------------------
+# affinity
+
+@test "client/DaemonSet: affinity not set by default" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -x templates/client-daemonset.yaml  \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec | .affinity? == null' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
+@test "client/DaemonSet: specified affinity" {
+  cd `chart_dir`
+  local actual=$(helm template \
+      -x templates/client-daemonset.yaml  \
+      --set 'client.affinity=foobar' \
+      . | tee /dev/stderr |
+      yq '.spec.template.spec | .affinity == "foobar"' | tee /dev/stderr)
+  [ "${actual}" = "true" ]
+}
+
 #--------------------------------------------------------------------
 # priorityClassName
 

diff --git a/values.yaml b/values.yaml
@@ -206,6 +206,18 @@ client:
   #   beta.kubernetes.io/arch: amd64
   nodeSelector: null
 
+  # Affinity Settings for Client pods
+  # ref https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity
+  # Example:
+  # affinity:
+  #   nodeAffinity:
+  #     requiredDuringSchedulingIgnoredDuringExecution:
+  #       nodeSelectorTerms:
+  #       - matchExpressions:
+  #         - key: node-role.kubernetes.io/master
+  #           operator: DoesNotExist
+  affinity: {}
+
   # used to assign priority to client pods
   # ref: https://kubernetes.io/docs/concepts/configuration/pod-priority-preemption/
   priorityClassName: ""