Merge pull request #5525 from zivagolee/kuberouter_tolerations

add wider tolerations to the kube-router daemonset
2018-07-26 17:30:57 -07:00 · 2018-07-26 17:30:57 -07:00 · 8169f14124
parent 62cef683c0 a846b217c1
commit 8169f14124
2 changed files with 1 additions and 2 deletions
--- a/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template
+++ b/upup/models/cloudup/resources/addons/networking.kuberouter/k8s-1.6.yaml.template
@ -93,7 +93,6 @@ spec:
      - key: CriticalAddonsOnly
        operator: Exists
      - effect: NoSchedule
-        key: node-role.kubernetes.io/master
        operator: Exists
      volumes:
      - hostPath:
--- a/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
+++ b/upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
@ -681,7 +681,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri

 	if b.cluster.Spec.Networking.Kuberouter != nil {
 		key := "networking.kuberouter"
-		version := "0.1.1-kops.2"
+		version := "0.1.1-kops.3"

 		{
 			location := key + "/k8s-1.6.yaml"