kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5525 from zivagolee/kuberouter_tolerations 

add wider tolerations to the kube-router daemonset
This commit is contained in:
k8s-ci-robot 2018-07-26 17:30:57 -07:00 committed by GitHub
parent 62cef683c0 a846b217c1
commit 8169f14124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,7 +93,6 @@ spec:
- key: CriticalAddonsOnly - key: CriticalAddonsOnly
operator: Exists operator: Exists
- effect: NoSchedule - effect: NoSchedule
key: node-role.kubernetes.io/master
operator: Exists operator: Exists
volumes: volumes:
- hostPath: - hostPath:

2
upup/pkg/fi/cloudup/bootstrapchannelbuilder.go
View File

@ -681,7 +681,7 @@ func (b *BootstrapChannelBuilder) buildManifest() (*channelsapi.Addons, map[stri
if b.cluster.Spec.Networking.Kuberouter != nil { if b.cluster.Spec.Networking.Kuberouter != nil {
key := "networking.kuberouter" key := "networking.kuberouter"
version := "0.1.1-kops.2" version := "0.1.1-kops.3"
{ {
location := key + "/k8s-1.6.yaml" location := key + "/k8s-1.6.yaml"