affinity stanzas in provider pods (#725)

* affinity stanzas in provider pods 
* fix provider affinity macro

Co-authored-by: hunhoffe

Author: dgrove-oss

helm/openwhisk/templates/_affinity.tpl

@@ -73,7 +73,6 @@ nodeAffinity:
         operator: NotIn
         values:
         - {{ .Values.affinity.invokerNodeLabel }}
-  preferredDuringSchedulingIgnoredDuringExecution:
   - weight: 80
     preference:
       matchExpressions:

helm/openwhisk/templates/provider-alarm-pod.yaml

@@ -47,6 +47,12 @@ spec:
 {{- else }}
           emptyDir: {}
 {{- end }}
+
+{{- if .Values.affinity.enabled }}
+      affinity:
+{{ include "openwhisk.affinity.provider" . | indent 8 }}
+{{- end }}
+
       initContainers:
       # Wait for a controller to be up (which implies couchdb is up as well).
 {{ include "openwhisk.readiness.waitForController" . | indent 6 }}

helm/openwhisk/templates/provider-kafka-pod.yaml

@@ -35,6 +35,10 @@ spec:
 {{ include "openwhisk.label_boilerplate" . | indent 8 }}
     spec:
       restartPolicy: {{ .Values.providers.kafka.restartPolicy }}
+{{- if .Values.affinity.enabled }}
+      affinity:
+{{ include "openwhisk.affinity.provider" . | indent 8 }}
+{{- end }}
       initContainers:
       # Wait for a controller to be up (which implies couchdb and kafka are up as well).
 {{ include "openwhisk.readiness.waitForController" . | indent 6 }}