Merge "Add noteAffinity option to kafka/zookeeper"

diff --cc kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
Simple merge

diff --cc kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
index b6567bb,3ed1cb3..e719cb1
--- 1/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
--- 2/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/values.yaml
@@@ -47,13 -47,12 +47,14 @@@ replicaCount: 
  # defult partitions
  defaultpartitions: 3
  
- 
  nodeSelector: {}
  
+ nodeAffinity: {}
+ 
  affinity: {}
  
 +tolerations: {}
 +
  # probe configuration parameters
  liveness:
    initialDelaySeconds: 60

diff --cc kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
Simple merge

diff --cc kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
index be74831,f658d2c..c0a7450
--- 1/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
--- 2/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/values.yaml
@@@ -49,10 -49,10 +49,12 @@@ replicaCount: 
  
  nodeSelector: {}
  
+ nodeAffinity: {}
+ 
  affinity: {}
  
 +tolerations: {}
 +
  # probe configuration parameters
  liveness:
    initialDelaySeconds: 10