From 308dd5a2bb43bf41e9e0daa2a2e2efebed784487 Mon Sep 17 00:00:00 2001
From: krufab <10956489+krufab@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:02:28 +0200
Subject: [PATCH 1/4] Update adding-windows-nodes.md

The steps in the run.ps1 file defined in the flannel-*.yml ConfigMap should address the correct interface in case the Windows node has more than one.
---
 .../kubeadm/adding-windows-nodes.md                 | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
index 54978dc55d..7d00b6158e 100644
--- a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
+++ b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
@@ -114,11 +114,22 @@ Once you have a Linux-based Kubernetes control-plane node you are ready to choos
     curl -L https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/kube-proxy.yml | sed 's/VERSION/{{< param "fullversion" >}}/g' | kubectl apply -f -
     kubectl apply -f https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml
     ```
-
     {{< note >}}
     If you're using host-gateway use https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-host-gw.yml instead
     {{< /note >}}
 
+    {{< note >}}
+    If you're using a different interface rather than Ethernet (i.e. "Ethernet0 2") on the Windows nodes, you have to modify the line
+    ```wins cli process run --path /k/flannel/setup.exe --args "--mode=overlay --interface=Ethernet"```
+    in the flannel-*.yml file and specify your interface accordingly.
+    ```bash
+    # i.e.
+    curl -Lo flannel-overlay.yml https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml
+    sed -i "s|=Ethernet|Ethernet0 2|g"
+    kubectl apply -f flannel-overlay.yml
+    ```
+    {{< /note >}}
+
 ### Joining a Windows worker node
 {{< note >}}
 You must install the `Containers` feature and install Docker. Instructions

From 2d7f82e63b78138f7194a571e4ee4c52a90eaa5f Mon Sep 17 00:00:00 2001
From: krufab <10956489+krufab@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:59:43 +0200
Subject: [PATCH 2/4] Updated layout

---
 .../administer-cluster/kubeadm/adding-windows-nodes.md      | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
index 7d00b6158e..8853d90b0e 100644
--- a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
+++ b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
@@ -122,13 +122,15 @@ Once you have a Linux-based Kubernetes control-plane node you are ready to choos
     If you're using a different interface rather than Ethernet (i.e. "Ethernet0 2") on the Windows nodes, you have to modify the line
     ```wins cli process run --path /k/flannel/setup.exe --args "--mode=overlay --interface=Ethernet"```
     in the flannel-*.yml file and specify your interface accordingly.
+    {{< /note >}}
+    
     ```bash
-    # i.e.
+    # Example
     curl -Lo flannel-overlay.yml https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml
     sed -i "s|=Ethernet|Ethernet0 2|g"
     kubectl apply -f flannel-overlay.yml
     ```
-    {{< /note >}}
+
 
 ### Joining a Windows worker node
 {{< note >}}

From 8e8c6d3de8dbbe6b9d3b68ff75655d7131ded823 Mon Sep 17 00:00:00 2001
From: krufab <10956489+krufab@users.noreply.github.com>
Date: Fri, 3 Apr 2020 16:13:47 +0200
Subject: [PATCH 3/4] Minor update

Updated text according to PR comments
---
 .../administer-cluster/kubeadm/adding-windows-nodes.md   | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
index 8853d90b0e..10fde87f44 100644
--- a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
+++ b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
@@ -119,9 +119,12 @@ Once you have a Linux-based Kubernetes control-plane node you are ready to choos
     {{< /note >}}
 
     {{< note >}}
-    If you're using a different interface rather than Ethernet (i.e. "Ethernet0 2") on the Windows nodes, you have to modify the line
-    ```wins cli process run --path /k/flannel/setup.exe --args "--mode=overlay --interface=Ethernet"```
-    in the flannel-*.yml file and specify your interface accordingly.
+    If you're using a different interface rather than Ethernet (i.e. "Ethernet0 2") on the Windows nodes, you have to modify the line:
+    
+    ```powershell
+    wins cli process run --path /k/flannel/setup.exe --args "--mode=overlay --interface=Ethernet"
+    ```
+    in the flannel-host-gw.yml or flannel-overlay.yml file and specify your interface accordingly.
     {{< /note >}}
     
     ```bash

From 40ca15c523cb14d2191a64f7bf4eff30d7a6e054 Mon Sep 17 00:00:00 2001
From: krufab <10956489+krufab@users.noreply.github.com>
Date: Fri, 3 Apr 2020 19:08:23 +0200
Subject: [PATCH 4/4] Minor change

Update text according to the PR comment
---
 .../tasks/administer-cluster/kubeadm/adding-windows-nodes.md  | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
index 10fde87f44..f6d58c87c4 100644
--- a/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
+++ b/content/en/docs/tasks/administer-cluster/kubeadm/adding-windows-nodes.md
@@ -129,9 +129,7 @@ Once you have a Linux-based Kubernetes control-plane node you are ready to choos
     
     ```bash
     # Example
-    curl -Lo flannel-overlay.yml https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml
-    sed -i "s|=Ethernet|Ethernet0 2|g"
-    kubectl apply -f flannel-overlay.yml
+    curl -L https://github.com/kubernetes-sigs/sig-windows-tools/releases/latest/download/flannel-overlay.yml | sed 's/Ethernet/Ethernet0 2/g' | kubectl apply -f -
     ```