Merge pull request #9547 from johngmyers/kuberouter-toleration

Widen the tolerations of kuberouter

upup/models/bindata.go

@@ -7295,14 +7295,7 @@ spec:
           name: kube-router-cfg
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
-        operator: Exists
+      - operator: Exists
       volumes:
       - name: lib-modules
         hostPath:
@@ -7485,10 +7478,7 @@ spec:
       hostNetwork: true
       serviceAccountName: kube-router
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - effect: NoSchedule
-        operator: Exists
+      - operator: Exists
       volumes:
       - hostPath:
           path: /lib/modules

upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.12.yaml.template

@@ -109,14 +109,7 @@ spec:
           name: kube-router-cfg
       hostNetwork: true
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
-        operator: Exists
-      - effect: NoSchedule
-        key: node.kubernetes.io/not-ready
-        operator: Exists
+      - operator: Exists
       volumes:
       - name: lib-modules
         hostPath:

upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template

@@ -90,10 +90,7 @@ spec:
       hostNetwork: true
       serviceAccountName: kube-router
       tolerations:
-      - key: CriticalAddonsOnly
-        operator: Exists
-      - effect: NoSchedule
-        operator: Exists
+      - operator: Exists
       volumes:
       - hostPath:
           path: /lib/modules

upup/pkg/fi/cloudup/bootstrapchannelbuilder.go

@@ -841,8 +841,8 @@ func (b *BootstrapChannelBuilder) buildAddons() *channelsapi.Addons {
 	if b.Cluster.Spec.Networking.Kuberouter != nil {
 		key := "networking.kuberouter"
 		versions := map[string]string{
-			"k8s-1.6":  "0.3.1-kops.3",
-			"k8s-1.12": "1.0.0-kops.1",
+			"k8s-1.6":  "0.3.1-kops.4",
+			"k8s-1.12": "1.0.0-kops.2",
 		}
 
 		{