upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-06-10 17:35:44 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #69940 from MarcPow/master

Browse source 
Bind coredns containers to  linux nodes to avoid Windows scheduling
This commit is contained in:
Kubernetes Prow Robot 2019-01-23 12:19:53 -08:00 committed by GitHub
commit baaaa15fdf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cluster/addons/dns/coredns/coredns.yaml.base
View file

@ -110,6 +110,8 @@ spec:
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.6

2
cluster/addons/dns/coredns/coredns.yaml.in
View file

@ -110,6 +110,8 @@ spec:
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.6

2
cluster/addons/dns/coredns/coredns.yaml.sed
View file

@ -110,6 +110,8 @@ spec:
tolerations:
- key: "CriticalAddonsOnly"
operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: k8s.gcr.io/coredns:1.2.6

2
cmd/kubeadm/app/phases/addons/dns/manifests.go
View file

@ -237,6 +237,8 @@ spec:
operator: Exists
- key: {{ .MasterTaintKey }}
effect: NoSchedule
nodeSelector:
beta.kubernetes.io/os: linux
containers:
- name: coredns
image: {{ .Image }}