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

Merge pull request #3318 from BradErz/fixes-#3317 

Automatic merge from submit-queue

Fixes #3317 allowing to spawn flannel on all nodes in the cluster
This commit is contained in:
Kubernetes Submit Queue 2017-08-30 10:23:59 -07:00 committed by GitHub
parent 155650eb82 cf1a907d0e
commit 2fd0ddb484
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
upup/models/cloudup/resources/addons/networking.flannel/k8s-1.6.yaml
View File

@ -96,8 +96,7 @@ spec:
beta.kubernetes.io/arch: amd64 beta.kubernetes.io/arch: amd64
serviceAccountName: flannel serviceAccountName: flannel
tolerations: tolerations:
- effect: NoSchedule - operator: Exists
key: node-role.kubernetes.io/master
containers: containers:
- name: kube-flannel - name: kube-flannel
image: quay.io/coreos/flannel:v0.7.1 image: quay.io/coreos/flannel:v0.7.1