From 4d94bfdcdf33d27b966a38d4e3089021b8b30ffe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=BD=87?= <xiaozhang0210@hotmail.com>
Date: Sat, 21 Sep 2019 17:59:02 +0800
Subject: [PATCH 1/2] Bind kube-proxy containers to linux nodes to avoid
 Windows scheduling

---
 cluster/addons/kube-proxy/kube-proxy-ds.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
index 7f92f5f3743..d546d424f29 100644
--- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml
+++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -26,6 +26,7 @@ spec:
       hostNetwork: true
       nodeSelector:
         node.kubernetes.io/kube-proxy-ds-ready: "true"
+        beta.kubernetes.io/os: linux
       tolerations:
       - operator: "Exists"
         effect: "NoExecute"

From d6c997673912d9ce6609a03fcdf5dfd1ced9e9fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E6=BD=87?= <xiaozhang0210@hotmail.com>
Date: Sun, 22 Sep 2019 08:00:40 +0800
Subject: [PATCH 2/2] Offical kubernetes dashboard should schedule to linux
 node

---
 cluster/addons/dashboard/dashboard-controller.yaml | 2 ++
 cluster/addons/kube-proxy/kube-proxy-ds.yaml       | 1 -
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cluster/addons/dashboard/dashboard-controller.yaml b/cluster/addons/dashboard/dashboard-controller.yaml
index 830fa7696e6..6af2a73d186 100644
--- a/cluster/addons/dashboard/dashboard-controller.yaml
+++ b/cluster/addons/dashboard/dashboard-controller.yaml
@@ -62,6 +62,8 @@ spec:
       - name: tmp-volume
         emptyDir: {}
       serviceAccountName: kubernetes-dashboard
+      nodeSelector:
+        "beta.kubernetes.io/os": linux
       tolerations:
       - key: "CriticalAddonsOnly"
         operator: "Exists"
diff --git a/cluster/addons/kube-proxy/kube-proxy-ds.yaml b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
index d546d424f29..7f92f5f3743 100644
--- a/cluster/addons/kube-proxy/kube-proxy-ds.yaml
+++ b/cluster/addons/kube-proxy/kube-proxy-ds.yaml
@@ -26,7 +26,6 @@ spec:
       hostNetwork: true
       nodeSelector:
         node.kubernetes.io/kube-proxy-ds-ready: "true"
-        beta.kubernetes.io/os: linux
       tolerations:
       - operator: "Exists"
         effect: "NoExecute"