From ea6ea32ece2bb5c6fa10432b0e339545ff68d595 Mon Sep 17 00:00:00 2001 From: Jiangtian Li Date: Wed, 24 Jan 2018 15:11:22 -0800 Subject: [PATCH 1/2] Update window binary build documentation --- docs/kubernetes-build-win-binaries.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/kubernetes-build-win-binaries.md b/docs/kubernetes-build-win-binaries.md index 58f2819780..e14a0fb25f 100644 --- a/docs/kubernetes-build-win-binaries.md +++ b/docs/kubernetes-build-win-binaries.md @@ -4,18 +4,18 @@ The following instructions show how to deploy the Windows Kubernetes Binaries an ### Prerequisites * Azure Storage Account and Azure Storage Container to store Windows binaries -* Access to [winnat.sys](https://blogs.technet.microsoft.com/virtualization/2016/05/25/windows-nat-winnat-capabilities-and-limitations/) stored in a storage container. (WinNAT) is used to provide required NAT networking functionality for Windows containers that will be included in a future Windows image update. +* Access to [wincni.exe] (https://github.com/Microsoft/SDN/tree/master/Kubernetes/windows/cni) stored in a storage container. Windows CNI is a plugin that supports the Container Network Interface (CNI) network model and interfaces with the Windows Host Networking Service (HNS) to configure host networking and policy. * Docker installed and running. MacOS users using Docker for Mac must have at [least 3GB of memory allocated to Docker](https://github.com/kubernetes/kubernetes/tree/master/build/#requirements) or building will likely fail. ## Background -Microsoft maintains a fork of the Kubernetes project at https://github.com/Azure/kubernetes which includes patches not yet included in upstream Kubernetes; these are needed for Windows containers to function. +Microsoft maintains a fork of the Kubernetes project at https://github.com/Azure/kubernetes which includes patches not yet included in upstream Kubernetes for release 1.7 and 1.8; these are needed for Windows containers to function. *From release 1.9, all Windows features are in upstream and Windows binaries no longer needs to be built from Azure fork.* [build-windows-k8s.sh](../scripts/build-windows-k8s.sh) does the following: - Checks out the fork of Azure/kubernetes (includes Windows fixes not yet in upstream Kubernetes, needed for Windows containers to function) - Builds kubelet.exe and kube-proxy.exe from source in a Docker container - Downloads kubectl.exe for desired release - Downloads [NSSM](https://nssm.cc) which is used to start kubelet and kube-proxy on Windows -- Downloads [Windows NAT](https://blogs.technet.microsoft.com/virtualization/2016/05/25/windows-nat-winnat-capabilities-and-limitations/) +- Downloads [Windows CNI](https://github.com/Microsoft/SDN/tree/master/Kubernetes/windows/cni) - Creates an .zip archive of these Windows components - Uploads archive to Azure Blob Storage From 00c4cfb798eecf6e452e3f46d1ea4ac8f043b3a0 Mon Sep 17 00:00:00 2001 From: Jiangtian Li Date: Wed, 24 Jan 2018 15:38:28 -0800 Subject: [PATCH 2/2] move background section --- docs/kubernetes-build-win-binaries.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/kubernetes-build-win-binaries.md b/docs/kubernetes-build-win-binaries.md index e14a0fb25f..9da60a41cd 100644 --- a/docs/kubernetes-build-win-binaries.md +++ b/docs/kubernetes-build-win-binaries.md @@ -1,5 +1,9 @@ # Building Windows Kubernetes Binaries and deploy to an Azure storage account +## Background +Microsoft maintains a fork of the Kubernetes project at https://github.com/Azure/kubernetes which includes patches not yet included in upstream Kubernetes for release 1.7 and 1.8; these are needed for Windows containers to function. *From release 1.9, all Windows features are in upstream and Windows binaries no longer needs to be built from Azure fork.* + +## Instructions The following instructions show how to deploy the Windows Kubernetes Binaries and deploy them to an Azure Storage Account. ### Prerequisites @@ -7,9 +11,6 @@ The following instructions show how to deploy the Windows Kubernetes Binaries an * Access to [wincni.exe] (https://github.com/Microsoft/SDN/tree/master/Kubernetes/windows/cni) stored in a storage container. Windows CNI is a plugin that supports the Container Network Interface (CNI) network model and interfaces with the Windows Host Networking Service (HNS) to configure host networking and policy. * Docker installed and running. MacOS users using Docker for Mac must have at [least 3GB of memory allocated to Docker](https://github.com/kubernetes/kubernetes/tree/master/build/#requirements) or building will likely fail. -## Background -Microsoft maintains a fork of the Kubernetes project at https://github.com/Azure/kubernetes which includes patches not yet included in upstream Kubernetes for release 1.7 and 1.8; these are needed for Windows containers to function. *From release 1.9, all Windows features are in upstream and Windows binaries no longer needs to be built from Azure fork.* - [build-windows-k8s.sh](../scripts/build-windows-k8s.sh) does the following: - Checks out the fork of Azure/kubernetes (includes Windows fixes not yet in upstream Kubernetes, needed for Windows containers to function) - Builds kubelet.exe and kube-proxy.exe from source in a Docker container