Fix to check if affinity is enabled (#606)

Author: upgle

README.md

@@ -200,6 +200,19 @@ If you have dedicated Ingress nodes, label them with
 Event Providers on specific nodes, label those nodes with
 `openwhisk-role=provider`.
 
+### Disabling affinity (not recommended)
+If the Kubernetes cluster does not allow you to assign a label to a node, or you cannot use the affinity attribute, you can disable it.
+Please note that it is suitable for testing purposes only and may interfere with the OpenWhisk control plane.
+
+You can disable affinity by editing the `mycluster.yaml` file:
+
+```yaml
+affinity:
+  enabled: false
+invoker:
+  options: "-Dwhisk.kubernetes.user-pod-node-affinity.enabled=false"
+```
+
 ## Customize the Deployment
 
 You must create a `mycluster.yaml` file to record key aspects of your

helm/openwhisk/templates/invoker-pod.yaml

@@ -56,11 +56,13 @@ spec:
 {{- end }}
       restartPolicy: {{ .Values.invoker.restartPolicy }}
 
+{{- if .Values.affinity.enabled }}
       affinity:
 {{ include "openwhisk.affinity.invoker" . | indent 8 }}
 {{- if eq .Values.invoker.containerFactory.impl "kubernetes" }}
 {{ include "openwhisk.affinity.selfAntiAffinity" ( printf "%s-invoker" .Release.Name ) | indent 8 }}
 {{- end }}
+{{- end }}
 
 {{- if .Values.toleration.enabled }}
       tolerations:

helm/openwhisk/templates/user-events-pod.yaml

@@ -39,7 +39,7 @@ spec:
     spec:
       restartPolicy: {{ .Values.user_events.restartPolicy }}
 
-      {{- if .Values.metrics.userMetricsEnabled }}
+      {{- if and .Values.affinity.enabled .Values.metrics.userMetricsEnabled }}
       affinity:
 {{ include "openwhisk.affinity.core" . | indent 8 }}
 {{ include "openwhisk.affinity.selfAntiAffinity" ( printf "%s-user-events" .Release.Name ) | indent 8 }}