[incubator-openwhisk-deploy-kube] branch master updated: enable node affinity for invoker-agent DaemonSet (#289)

[da...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new cb27dcb  enable node affinity for invoker-agent DaemonSet (#289)
cb27dcb is described below

commit cb27dcb5442b304c7a65a2d6edbd924d72124211
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Tue Aug 28 22:04:50 2018 -0400

    enable node affinity for invoker-agent DaemonSet (#289)
    
    Upstream PR 3963 enhanced the KubernetesContainerFactory to
    create user action pods with the proper node affinity, therefore
    we can now restrict the invokerAgent to only run on invoker nodes.
---
 helm/openwhisk/templates/invoker.yaml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/helm/openwhisk/templates/invoker.yaml b/helm/openwhisk/templates/invoker.yaml
index c9d17af..5e3641a 100644
--- a/helm/openwhisk/templates/invoker.yaml
+++ b/helm/openwhisk/templates/invoker.yaml
@@ -177,11 +177,8 @@ spec:
       restartPolicy: Always
       hostNetwork: true
 
-      # TODO: disabled affinity until user-action pods are
-      #       created by KubernetesContainerFacotry with the
-      #       same affinity rules.
-      #       Requires extension to upstream kube java client
-      #       run only on nodes labeled with openwhisk-role=invoker
+      affinity:
+{{ include "affinity.invoker" . | indent 8 }}
 
       volumes:
 {{ include "docker_volumes" . | indent 6 }}