Merge "Add noteAffinity option to kafka/zookeeper"

diff --combined kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
index 225181c,ae8364c..f4583a1
--- 1/kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
--- 2/kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-kafka/templates/statefulset.yaml
@@@ -44,6 -44,10 +44,10 @@@ spec
                      values:
                      - {{ include "common.name" . }}
               topologyKey: "kubernetes.io/hostname"
+       {{- if .Values.nodeAffinity }}
+       nodeAffinity:
+         {{ toYaml .Values.nodeAffinity | indent 10 }}
+       {{- end }}
        initContainers:
        - name: {{ include "common.name" . }}-initcontainer
          image: "{{ .Values.global.ubuntuInitRepository }}/{{ .Values.ubuntuInitImage }}"
@@@ -121,10 -125,6 +125,10 @@@
            name: docker-socket
          - mountPath: /kafka
            name: kafka-data
 +      {{- if .Values.tolerations }}
 +      tolerations:
 +        {{ toYaml .Values.tolerations | indent 10 }}
 +      {{- end }}
        volumes:
        - name: localtime
          hostPath:

diff --combined 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 --combined kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
index 7cafc14,d1ba2f5..b2f9f13
--- 1/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
--- 2/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
+++ b/kubernetes/dmaap/components/message-router/charts/message-router-zookeeper/templates/statefulset.yaml
@@@ -48,6 -48,10 +48,10 @@@ spec
                      values:
                      - {{ include "common.name" . }}
               topologyKey: "kubernetes.io/hostname"
+       {{- if .Values.nodeAffinity }}
+       nodeAffinity:
+         {{ toYaml .Values.nodeAffinity | indent 10 }}
+       {{- end }}
        initContainers:
        - name: {{ include "common.name" . }}-seed-topics-apikeys
          command:
@@@ -111,10 -115,6 +115,10 @@@
            readOnly: true
          - mountPath: /var/lib/zookeeper/data
            name: zookeeper-data
 +      {{- if .Values.tolerations }}
 +      tolerations:
 +        {{ toYaml .Values.tolerations | indent 10 }}
 +      {{- end }}
        volumes:
        - name: localtime
          hostPath:

diff --combined 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