Merge pull request #139 from contiv/master

Merging master into release-1.0 (again)

Author: dseevr

install/k8s/k8s1.6/aci_gw.yaml

@@ -23,6 +23,8 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       serviceAccountName: contiv-netmaster
       containers:
         # Runs aci-gw container on each Kubernetes node. 

install/k8s/k8s1.6/contiv.yaml

@@ -137,6 +137,8 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       serviceAccountName: contiv-netplugin
       containers:
         # Runs netplugin container on each Kubernetes node.  This
@@ -253,6 +255,8 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       serviceAccountName: contiv-netmaster
       containers:
         - name: contiv-netmaster
@@ -342,6 +346,8 @@ spec:
       tolerations:
       - key: node-role.kubernetes.io/master
         effect: NoSchedule
+      nodeSelector:
+        node-role.kubernetes.io/master: ""
       serviceAccountName: contiv-netmaster
       containers:
         - name: contiv-api-proxy