helm chart update ; adding support to set affinity in podSpec to the empty map (#2576)

* adding support to set affinity in podSpec to the empty map

* remove typo

* updated readme

Co-authored-by: Kishor Joshi <[email protected]>

Author: stensonb

helm/aws-load-balancer-controller/README.md

@@ -176,7 +176,7 @@ The default values set by the application itself can be confirmed [here](https:/
 | `priorityClassName`                            | Controller pod priority class                                                                            | system-cluster-critical                                                            |
 | `nodeSelector`                                 | Node labels for controller pod assignment                                                                | `{}`                                                                               |
 | `tolerations`                                  | Controller pod toleration for taints                                                                     | `{}`                                                                               |
-| `affinity`                                     | Affinity for pod assignment                                                                              | `{}`                                                                               |
+| `affinity`                                     | Affinity for pod assignment (string or map) (soft affinity if string "default", set explicitly if map)   | `default`                                                                          |
 | `topologySpreadConstraints`                    | Topology Spread Constraints for pod assignment                                                           | `{}`                                                                               |
 | `podAnnotations`                               | Annotations to add to each pod                                                                           | `{}`                                                                               |
 | `podLabels`                                    | Labels to add to each pod                                                                                | `{}`                                                                               |

helm/aws-load-balancer-controller/templates/deployment.yaml

@@ -172,10 +172,14 @@ spec:
       nodeSelector:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.affinity }}
+      {{- if kindIs "map" .Values.affinity }}
+      {{- with .Values.affinity }}
       affinity:
-        {{- toYaml .Values.affinity | nindent 8 }}
-      {{- else }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+      {{- end }}
+      {{- if kindIs "string" .Values.affinity }}
+      {{- if eq .Values.affinity "default" }}
       affinity:
         podAntiAffinity:
           preferredDuringSchedulingIgnoredDuringExecution:
@@ -189,6 +193,7 @@ spec:
                   - {{ include "aws-load-balancer-controller.name" . }}
               topologyKey: kubernetes.io/hostname
       {{- end }}
+      {{- end }}
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}

helm/aws-load-balancer-controller/values.yaml

@@ -65,7 +65,15 @@ nodeSelector: {}
 
 tolerations: []
 
-affinity: {}
+# affinity can be either a string or map.
+#
+# if affinity is a string, and if that string is "default", set an antiAffinity policy on
+# the podSpec to prevent colocation on the same node.
+#
+# if affinity is a map, set the affinity attribute on the podSpec with this exact value (do NOT
+# use the default, as described above).
+# affinity: {}
+affinity: default
 
 # topologySpreadConstraints is a stable feature of k8s v1.19 which provides the ability to
 # control how Pods are spread across your cluster among failure-domains such as regions, zones,