[openwhisk-deploy-kube] branch master updated: affinity stanzas in provider pods (#725)

[dg...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git


The following commit(s) were added to refs/heads/master by this push:
     new 43c15b3  affinity stanzas in provider pods (#725)
43c15b3 is described below

commit 43c15b36e361d6f17a1af4a91e686d04671e7bdc
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Mon Mar 7 19:51:36 2022 -0500

    affinity stanzas in provider pods (#725)
    
    * affinity stanzas in provider pods
    * fix provider affinity macro
    
    Co-authored-by: hunhoffe
---
 helm/openwhisk/templates/_affinity.tpl           | 1 -
 helm/openwhisk/templates/provider-alarm-pod.yaml | 6 ++++++
 helm/openwhisk/templates/provider-kafka-pod.yaml | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/helm/openwhisk/templates/_affinity.tpl b/helm/openwhisk/templates/_affinity.tpl
index 61ebbcc..75833e7 100644
--- a/helm/openwhisk/templates/_affinity.tpl
+++ b/helm/openwhisk/templates/_affinity.tpl
@@ -73,7 +73,6 @@ nodeAffinity:
         operator: NotIn
         values:
         - {{ .Values.affinity.invokerNodeLabel }}
-  preferredDuringSchedulingIgnoredDuringExecution:
   - weight: 80
     preference:
       matchExpressions:
diff --git a/helm/openwhisk/templates/provider-alarm-pod.yaml b/helm/openwhisk/templates/provider-alarm-pod.yaml
index aebe0f6..c53caac 100644
--- a/helm/openwhisk/templates/provider-alarm-pod.yaml
+++ b/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 }}
diff --git a/helm/openwhisk/templates/provider-kafka-pod.yaml b/helm/openwhisk/templates/provider-kafka-pod.yaml
index cb8a82b..065bc1e 100644
--- a/helm/openwhisk/templates/provider-kafka-pod.yaml
+++ b/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 }}