Merge branch 'master' into win_docker_clarif

This commit is contained in:
devin-donnelly
2016-12-21 16:57:10 -05:00
committed by GitHub
7 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -135,7 +135,7 @@ Run the following in a PowerShell window with administrative privileges. Be awar
`.\proxy.exe --v=3 --proxy-mode=userspace --hostname-override=<ip address/hostname of the windows node> --master=<api server location> --bind-address=<ip address of the windows node>`
## Scheduling Pods on Windows
Because your cluster has both Linux and Windows nodes, you must explictly set the nodeSelector constraint to be able to schedule Pods to Windows nodes. You must set nodeSelector with the label beta.kubernetes.io/os to the value windows; see the following example:
Because your cluster has both Linux and Windows nodes, you must explicitly set the nodeSelector constraint to be able to schedule Pods to Windows nodes. You must set nodeSelector with the label beta.kubernetes.io/os to the value windows; see the following example:
```
{