Fix an issue caused by WinNAT (#520)

* Fix an issue caused by WinNAT

* Fix test failure

* Add WinNAT fix to v1.6.0 and v1.6.2

* Update example json to fix test error

parts/kuberneteswindowssetup.ps1

@@ -60,6 +60,7 @@ $global:SecurityGroupName = "{{{nsgName}}}"
 $global:VNetName = "{{{virtualNetworkName}}}"
 $global:RouteTableName = "{{{routeTableName}}}"
 $global:PrimaryAvailabilitySetName = "{{{primaryAvailablitySetName}}}"
+$global:NeedPatchWinNAT = $false
 
 filter Timestamp {"$(Get-Date -Format o): $_"}
 
@@ -89,6 +90,22 @@ Get-KubeBinaries()
     Expand-ZIPFile -File $zipfile -Destination C:\
 }
 
+function
+Patch-WinNATBinary()
+{
+    $winnatcurr = $global:KubeDir + "\winnat.sys"
+    if (Test-Path $winnatcurr)
+    {
+        $global:NeedPatchWinNAT = $true
+        $winnatsys = "$env:SystemRoot\System32\drivers\winnat.sys"
+        Stop-Service winnat
+        takeown /f $winnatsys
+        icacls $winnatsys /grant "Administrators:(F)"    
+        Copy-Item $winnatcurr $winnatsys
+        bcdedit /set TESTSIGNING on
+    }
+}
+
 function
 Write-AzureConfig()
 {
@@ -292,8 +309,11 @@ New-NSSMService
     c:\k\nssm set Kubelet AppRotateOnline 1
     c:\k\nssm set Kubelet AppRotateSeconds 86400
     c:\k\nssm set Kubelet AppRotateBytes 1048576
-    net start Kubelet
-
+    if ($global:NeedPatchWinNAT -eq $false)
+    {
+        net start Kubelet
+    }
+
     # setup kubeproxy
     c:\k\nssm install Kubeproxy C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe
     c:\k\nssm set Kubeproxy AppDirectory $global:KubeDir
@@ -311,7 +331,10 @@ New-NSSMService
     c:\k\nssm set Kubeproxy AppRotateOnline 1
     c:\k\nssm set Kubeproxy AppRotateSeconds 86400
     c:\k\nssm set Kubeproxy AppRotateBytes 1048576
-    net start Kubeproxy
+    if ($global:NeedPatchWinNAT -eq $false)
+    {
+        net start Kubeproxy
+    }
 }
 
 function
@@ -355,7 +378,15 @@ try
         Write-Log "Set Internet Explorer"
         Set-Explorer
 
+        Write-Log "Patch winnat binary"
+        Patch-WinNATBinary
+
         Write-Log "Setup Complete"
+        if ($global:NeedPatchWinNAT -eq $true)
+        {
+            Write-Log "Reboot for patching winnat to be effective and start kubelet/kubeproxy service"
+            Restart-Computer
+        }
     }
     else 
     {

pkg/acsengine/const.go

@@ -56,7 +56,7 @@ var KubeImages = map[string]map[string]string{
 		"addonmanager": "kube-addon-manager-amd64:v6.2",
 		"dnsmasq":      "kube-dnsmasq-amd64:1.3",
 		"pause":        "pause-amd64:3.0",
-		"windowszip":   "v1.6.2int.zip",
+		"windowszip":   "v1.6.2intwinnat.zip",
 	},
 
 	"1.6.0": {
@@ -69,7 +69,7 @@ var KubeImages = map[string]map[string]string{
 		"addonmanager": "kube-addon-manager-amd64:v6.2",
 		"dnsmasq":      "kube-dnsmasq-amd64:1.3",
 		"pause":        "pause-amd64:3.0",
-		"windowszip":   "v1.6.0int.zip",
+		"windowszip":   "v1.6.0intwinnat.zip",
 	},
 
 	"1.5.3": {
@@ -82,7 +82,7 @@ var KubeImages = map[string]map[string]string{
 		"addonmanager": "kube-addon-manager-amd64:v6.2",
 		"dnsmasq":      "kube-dnsmasq-amd64:1.3",
 		"pause":        "pause-amd64:3.0",
-		"windowszip":   "v1.5.3int.zip",
+		"windowszip":   "v1.5.3intwinnat.zip",
 	},
 }
 

pkg/acsengine/testdata/v20170131/kubernetes_expected_params.json

@@ -39,7 +39,7 @@
     "value": "10.240.255.5"
   },
   "kubeBinariesSASURL": {
-    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2int.zip"
+    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2intwinnat.zip"
   },
   "kubeBinariesVersion": {
     "value": "1.6.2"

pkg/acsengine/testdata/windows/kubernetes-hybrid_expected_params.json

@@ -30,7 +30,7 @@
     "value": "10.240.255.5"
   },
   "kubeBinariesSASURL": {
-    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2int.zip"
+    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2intwinnat.zip"
   },
   "kubeBinariesVersion": {
     "value": "1.6.2"

pkg/acsengine/testdata/windows/kubernetes_expected_params.json

@@ -30,7 +30,7 @@
     "value": "10.240.255.5"
   },
   "kubeBinariesSASURL": {
-    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2int.zip"
+    "value": "https://acs-mirror.azureedge.net/wink8s/v1.6.2intwinnat.zip"
   },
   "kubeBinariesVersion": {
     "value": "1.6.2"