Merge pull request #4645 from wawa0210/zx-scheduler

Bind ingress controller to linux nodes to avoid Windows scheduling on kubernetes cluster includes linux nodes and windows nodes
kubernetes · Oct 13, 2019 · a1a2950 · a1a2950
2 parents 69880ac + 1908d0e
commit a1a2950
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/deploy/static/mandatory.yaml b/deploy/static/mandatory.yaml
@@ -213,6 +213,8 @@ spec:
       # wait up to five minutes for the drain of connections
       terminationGracePeriodSeconds: 300
       serviceAccountName: nginx-ingress-serviceaccount
+      nodeSelector:
+        kubernetes.io/os: linux
       containers:
         - name: nginx-ingress-controller
           image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1

diff --git a/deploy/static/with-rbac.yaml b/deploy/static/with-rbac.yaml
@@ -24,6 +24,8 @@ spec:
       # wait up to five minutes for the drain of connections
       terminationGracePeriodSeconds: 300
       serviceAccountName: nginx-ingress-serviceaccount
+      nodeSelector:
+        kubernetes.io/os: linux
       containers:
         - name: nginx-ingress-controller
           image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.26.1