Merge pull request #5946 from jhohertz/cni-taint-tolerations

More CNI toleration for tainted nodes.

upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.10.yaml.template

@@ -62,8 +62,10 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
       - key: CriticalAddonsOnly
         operator: Exists
       containers:

upup/models/cloudup/resources/addons/networking.amazon-vpc-routed-eni/k8s-1.8.yaml.template

@@ -62,8 +62,10 @@ spec:
       serviceAccountName: aws-node
       hostNetwork: true
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
       - key: CriticalAddonsOnly
         operator: Exists
       containers:

upup/models/cloudup/resources/addons/networking.kope.io/k8s-1.6.yaml

@@ -36,8 +36,10 @@ spec:
               readOnly: true
       serviceAccountName: kopeio-networking-agent
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
       volumes:
         - name: lib-modules
           hostPath:

upup/models/cloudup/resources/addons/networking.romana/k8s-1.7.yaml.template

@@ -198,8 +198,10 @@ spec:
           type: spc_t
       serviceAccountName: romana-agent
       tolerations:
-      - key: node-role.kubernetes.io/master
-        effect: NoSchedule
+      - effect: NoSchedule
+        operator: Exists
+      - effect: NoExecute
+        operator: Exists
       containers:
       - name: romana-agent
         image: quay.io/romana/agent:v2.0.2

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -501,7 +501,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Kopeio != nil {
 		key := "networking.kope.io"
-		version := "1.0.20180319"
+		version := "1.0.20180319-kops.2"
 
 		{
 			location := key + "/pre-k8s-1.6.yaml"
@@ -784,7 +784,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.Romana != nil {
 		key := "networking.romana"
-		version := "v2.0.2"
+		version := "v2.0.2-kops.2"
 
 		{
 			location := key + "/k8s-1.7.yaml"
@@ -804,7 +804,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
 
 	if b.cluster.Spec.Networking.AmazonVPC != nil {
 		key := "networking.amazon-vpc-routed-eni"
-		version := "1.0.0-kops.2"
+		version := "1.0.0-kops.3"
 
 		{
 			id := "k8s-1.7"

upup/pkg/fi/cloudup/tests/bootstrapchannelbuilder/kopeio-vxlan/manifest.yaml

@@ -69,11 +69,11 @@ spec:
     name: networking.kope.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.0.20180319
+    version: 1.0.20180319-kops.2
   - id: k8s-1.6
     kubernetesVersion: '>=1.6.0'
     manifest: networking.kope.io/k8s-1.6.yaml
     name: networking.kope.io
     selector:
       role.kubernetes.io/networking: "1"
-    version: 1.0.20180319
+    version: 1.0.20180319-kops.2