kubernetes
/
website
mirror of https://github.com/kubernetes/website.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1927 from kubernetes/devin-donnelly-patch-1 

Add standard markdown header to windows/index.md
reviewable/pr1930/r1
devin-donnelly 2016-12-12 13:45:36 -05:00 committed by GitHub
parent 19cbca1a21 8f0f15e1a1
commit 449ac76a6c
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
docs/getting-started-guides/windows/index.md
View File

@ -1,4 +1,7 @@
# Running Windows Server Containers using Kubernetes ---
---
Kubernetes version 1.5 introduces support for Windows Server Containers. In version 1.5, the Kubernetes control plane (API Server, Scheduler, Controller Manager, etc) continue to run on Linux, while the kubelet and kube-proxy can be run on Windows Server. Kubernetes version 1.5 introduces support for Windows Server Containers. In version 1.5, the Kubernetes control plane (API Server, Scheduler, Controller Manager, etc) continue to run on Linux, while the kubelet and kube-proxy can be run on Windows Server.
**Note:** Windows Server Containers on Kubernetes is an Alpha feature in Kubernetes 1.5. **Note:** Windows Server Containers on Kubernetes is an Alpha feature in Kubernetes 1.5.