github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #69940 from MarcPow/master 

Bind coredns containers to  linux nodes to avoid Windows scheduling
pull/564/head
Kubernetes Prow Robot 2019-01-23 12:19:53 -08:00 committed by GitHub
parent b66e332d3c eb818f95d1
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: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns:1.2.6 image: k8s.gcr.io/coredns:1.2.6

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

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

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

@ -110,6 +110,8 @@ spec:
tolerations: tolerations:
- key: "CriticalAddonsOnly" - key: "CriticalAddonsOnly"
operator: "Exists" operator: "Exists"
nodeSelector:
beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: k8s.gcr.io/coredns:1.2.6 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 operator: Exists
- key: {{ .MasterTaintKey }} - key: {{ .MasterTaintKey }}
effect: NoSchedule effect: NoSchedule
nodeSelector:
beta.kubernetes.io/os: linux
containers: containers:
- name: coredns - name: coredns
image: {{ .Image }} image: {{ .Image }}