Merge pull request #69940 from MarcPow/master

Bind coredns containers to linux nodes to avoid Windows scheduling
2019-01-23 12:19:53 -08:00 · 2019-01-23 12:19:53 -08:00 · baaaa15fdf
parent b66e332d3c eb818f95d1
commit baaaa15fdf
4 changed files with 8 additions and 0 deletions
--- a/cluster/addons/dns/coredns/coredns.yaml.base
+++ b/cluster/addons/dns/coredns/coredns.yaml.base
@ -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
--- a/cluster/addons/dns/coredns/coredns.yaml.in
+++ b/cluster/addons/dns/coredns/coredns.yaml.in
@ -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
--- a/cluster/addons/dns/coredns/coredns.yaml.sed
+++ b/cluster/addons/dns/coredns/coredns.yaml.sed
@ -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
--- a/cmd/kubeadm/app/phases/addons/dns/manifests.go
+++ b/cmd/kubeadm/app/phases/addons/dns/manifests.go
@ -237,6 +237,8 @@ spec:
        operator: Exists
      - key: {{ .MasterTaintKey }}
        effect: NoSchedule
+      nodeSelector:
+        beta.kubernetes.io/os: linux
      containers:
      - name: coredns
        image: {{ .Image }}