Support Windows Server 2019 and make it default (#4299)

Azure · Nov 29, 2018 · 51c9c95 · 51c9c95
1 parent f897033
commit 51c9c95
Show file tree

Hide file tree

Showing 12 changed files with 221 additions and 31 deletions.
diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md
@@ -609,7 +609,7 @@ https://{keyvaultname}.vault.azure.net:443/secrets/{secretName}/{version}
 | adminPassword                    | yes      | Password for the Windows adminstrator account created on each Windows node |
 | windowsPublisher                 | no       | Publisher used to find Windows VM to deploy from marketplace. Default: `MicrosoftWindowsServer` |
 | windowsOffer                     | no       | Offer used to find Windows VM to deploy from marketplace. Default: `WindowsServerSemiAnnual` |
-| windowsSku                       | no       | SKU usedto find Windows VM to deploy from marketplace. Default: `Datacenter-Core-1803-with-Containers-smalldisk` |
+| windowsSku                       | no       | SKU usedto find Windows VM to deploy from marketplace. Default: `Datacenter-Core-1809-with-Containers-smalldisk` |
 | imageVersion                     | no       | Specific image version to deploy from marketplace.  Default: `latest` |
 | windowsImageSourceURL            | no       | Path to an existing Azure storage blob with a sysprepped VHD. This is used to test pre-release or customized VHD files that you have uploaded to Azure. If provided, the above 4 parameters are ignored. |
 
@@ -626,8 +626,10 @@ $ az vm image list --publisher MicrosoftWindowsServer --all -o table
 Offer                    Publisher                      Sku                                             Urn                                                                                                            Version
 -----------------------  -----------------------------  ----------------------------------------------  -------------------------------------------------------------------------------------------------------------  -----------------
 ...
-WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1709-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1709-with-Containers-smalldisk:1709.0.20180412  1709.0.20180412
-WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1803-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1803-with-Containers-smalldisk:1803.0.20180504  1803.0.20180504
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1709-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1709-with-Containers-smalldisk:1709.0.20181017  1709.0.20181017
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1803-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1803-with-Containers-smalldisk:1803.0.20181017  1803.0.20181017
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1809-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1809-with-Containers-smalldisk:1809.0.20181107  1809.0.20181107
+WindowsServer            MicrosoftWindowsServer         2019-Datacenter-Core-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServer:2019-Datacenter-Core-with-Containers-smalldisk:2019.0.20181107            2019.0.20181107
 ```
 
 If you wanted to use the last one in the list above, then set:
@@ -637,9 +639,9 @@ If you wanted to use the last one in the list above, then set:
             "adminUsername": "...",
             "adminPassword": "...",
             "windowsPublisher": "MicrosoftWindowsServer",
-            "windowsOffer": "WindowsServerSemiAnnual",
-            "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk",
-            "imageVersion": "1803.0.20180504"
+            "windowsOffer": "WindowsServer",
+            "windowsSku": "2019-Datacenter-Core-with-Containers-smalldisk",
+            "imageVersion": "2019.0.20181107"
      },
 ```
 

diff --git a/docs/kubernetes/windows-details.md b/docs/kubernetes/windows-details.md
@@ -32,19 +32,21 @@ $ az vm image list --publisher MicrosoftWindowsServer --all -o table
 Offer                    Publisher                      Sku                                             Urn                                                                                                            Version
 -----------------------  -----------------------------  ----------------------------------------------  -------------------------------------------------------------------------------------------------------------  -----------------
 ...
-WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1709-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1709-with-Containers-smalldisk:1709.0.20180412  1709.0.20180412
-WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1803-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1803-with-Containers-smalldisk:1803.0.20180504  1803.0.20180504
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1709-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1709-with-Containers-smalldisk:1709.0.20181017  1709.0.20181017
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1803-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1803-with-Containers-smalldisk:1803.0.20181017  1803.0.20181017
+WindowsServerSemiAnnual  MicrosoftWindowsServer         Datacenter-Core-1809-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServerSemiAnnual:Datacenter-Core-1809-with-Containers-smalldisk:1809.0.20181107  1809.0.20181107
+WindowsServer            MicrosoftWindowsServer         2019-Datacenter-Core-with-Containers-smalldisk  MicrosoftWindowsServer:WindowsServer:2019-Datacenter-Core-with-Containers-smalldisk:2019.0.20181107            2019.0.20181107
 ```
 
-You can use the Offer, Publisher and Sku to pick a specific version by adding `windowsOffer`, `windowsPublisher`, `windowsSku` and (optionally) `imageVersion` to the `windowsProfile` section. In this example, the latest Windows Server version 1803 image would be deployed.
+You can use the Offer, Publisher and Sku to pick a specific version by adding `windowsOffer`, `windowsPublisher`, `windowsSku` and (optionally) `imageVersion` to the `windowsProfile` section. In this example, the latest Windows Server version 1809 image would be deployed.
 
 ```json
 "windowsProfile": {
             "adminUsername": "azureuser",
             "adminPassword": "...",
             "windowsPublisher": "MicrosoftWindowsServer",
             "windowsOffer": "WindowsServerSemiAnnual",
-            "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk"
+            "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk"
      },
 ```
 

diff --git a/examples/windows/kubernetes-windows-version.json b/examples/windows/kubernetes-windows-version.json
@@ -21,7 +21,10 @@
     "windowsProfile": {
       "adminUsername": "azureuser",
       "adminPassword": "replacepassword1234$",
-      "imageVersion": "2016.127.20170510"
+      "windowsPublisher": "MicrosoftWindowsServer",
+      "windowsOffer": "WindowsServerSemiAnnual",
+      "windowsSku": "Datacenter-Core-1803-with-Containers-smalldisk",
+      "imageVersion": "1803.0.20181017"
     },
     "linuxProfile": {
       "adminUsername": "azureuser",

diff --git a/parts/k8s/windowskubeletfunc.ps1 b/parts/k8s/windowskubeletfunc.ps1
@@ -148,8 +148,7 @@ New-InfraContainer
     } elseif ($computerInfo.WindowsVersion -eq "1803") {
         "microsoft/nanoserver:1803"
     } elseif ($computerInfo.WindowsVersion -eq "1809") {
-        # TODO: unsure if 2019 will report 1809 or not
-        "microsoft/nanoserver:1809"
+        "mcr.microsoft.com/windows/nanoserver:1809"
     } else {
         "mcr.microsoft.com/nanoserver-insider"
     }

diff --git a/parts/windowsparams.t b/parts/windowsparams.t
@@ -71,7 +71,7 @@
       "type": "string"
     },
     "agentWindowsSku": {
-      "defaultValue": "Datacenter-Core-1803-with-Containers-smalldisk",
+      "defaultValue": "Datacenter-Core-1809-with-Containers-smalldisk",
       "metadata": {
         "description": "The SKU of windows image for the agent virtual machines."
       },

diff --git a/pkg/acsengine/params.go b/pkg/acsengine/params.go
@@ -223,10 +223,8 @@ func getParameters(cs *api.ContainerService, generatorCode string, acsengineVers
 		if properties.WindowsProfile.WindowsOffer != "" {
 			addValue(parametersMap, "agentWindowsOffer", properties.WindowsProfile.WindowsOffer)
 		}
-		if properties.WindowsProfile.WindowsSku != "" {
-			addValue(parametersMap, "agentWindowsSku", properties.WindowsProfile.WindowsSku)
-		}
 
+		addValue(parametersMap, "agentWindowsSku", properties.WindowsProfile.GetWindowsSku())
 		addValue(parametersMap, "windowsDockerVersion", properties.WindowsProfile.GetWindowsDockerVersion())
 
 		for i, s := range properties.WindowsProfile.Secrets {

diff --git a/pkg/api/const.go b/pkg/api/const.go
@@ -45,6 +45,8 @@ const (
 	DockerCEDockerComposeVersion = "1.14.0"
 	// KubernetesWindowsDockerVersion is the default version for docker on Windows nodes in kubernetes
 	KubernetesWindowsDockerVersion = "18.09.0"
+	// KubernetesDefaultWindowsSku is the default SKU for Windows VMs in kubernetes
+	KubernetesDefaultWindowsSku = "Datacenter-Core-1809-with-Containers-smalldisk"
 )
 
 // validation values

diff --git a/pkg/api/types.go b/pkg/api/types.go
@@ -1126,6 +1126,14 @@ func (w *WindowsProfile) GetWindowsDockerVersion() string {
 	return KubernetesWindowsDockerVersion
 }
 
+// GetWindowsSku gets the marketplace sku specified (such as Datacenter-Core-1809-with-Containers-smalldisk) or returns default value
+func (w *WindowsProfile) GetWindowsSku() string {
+	if w.WindowsSku != "" {
+		return w.WindowsSku
+	}
+	return KubernetesDefaultWindowsSku
+}
+
 // HasSecrets returns true if the customer specified secrets to install
 func (l *LinuxProfile) HasSecrets() bool {
 	return len(l.Secrets) > 0

diff --git a/pkg/api/types_test.go b/pkg/api/types_test.go
@@ -800,6 +800,11 @@ func TestWindowsProfile(t *testing.T) {
 		t.Fatalf("Expected GetWindowsDockerVersion() to equal default KubernetesWindowsDockerVersion, got %s", dv)
 	}
 
+	windowsSku := w.GetWindowsSku()
+	if windowsSku != KubernetesDefaultWindowsSku {
+		t.Fatalf("Expected GetWindowsSku() to equal default KubernetesDefaultWindowsSku, got %s", windowsSku)
+	}
+
 	w = WindowsProfile{
 		Secrets: []KeyVaultSecrets{
 			{
@@ -821,12 +826,18 @@ func TestWindowsProfile(t *testing.T) {
 
 	w = WindowsProfile{
 		WindowsDockerVersion: "18.03.1-ee-3",
+		WindowsSku:           "Datacenter-Core-1809-with-Containers-smalldisk",
 	}
 
 	dv = w.GetWindowsDockerVersion()
 	if dv != "18.03.1-ee-3" {
 		t.Fatalf("Expected GetWindowsDockerVersion() to equal 18.03.1-ee-3, got %s", dv)
 	}
+
+	windowsSku = w.GetWindowsSku()
+	if windowsSku != "Datacenter-Core-1809-with-Containers-smalldisk" {
+		t.Fatalf("Expected GetWindowsSku() to equal Datacenter-Core-1809-with-Containers-smalldisk, got %s", windowsSku)
+	}
 }
 
 func TestLinuxProfile(t *testing.T) {

diff --git a/test/e2e/engine/template.go b/test/e2e/engine/template.go
@@ -189,6 +189,31 @@ func (e *Engine) HasWindowsAgents() bool {
 	return false
 }
 
+// WindowsTestImages holds the Windows container image names used in this test pass
+type WindowsTestImages struct {
+	IIS        string
+	ServerCore string
+}
+
+// GetWindowsTestImages will return the right list of container images for the Windows version used
+func (e *Engine) GetWindowsTestImages() (*WindowsTestImages, error) {
+	if !e.HasWindowsAgents() {
+		return nil, errors.New("Can't guess a Windows version without Windows nodes in the cluster")
+	}
+
+	if strings.Contains(e.ExpandedDefinition.Properties.WindowsProfile.GetWindowsSku(), "1809") || strings.Contains(e.ExpandedDefinition.Properties.WindowsProfile.GetWindowsSku(), "2019") {
+		return &WindowsTestImages{IIS: "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2019",
+			ServerCore: "mcr.microsoft.com/windows/servercore/iis:windowsservercore-ltsc2019"}, nil
+	} else if strings.Contains(e.ExpandedDefinition.Properties.WindowsProfile.GetWindowsSku(), "1803") {
+		return &WindowsTestImages{IIS: "microsoft/iis:windowsservercore-1803",
+			ServerCore: "microsoft/iis:windowsservercore-1803"}, nil
+	} else if strings.Contains(e.ExpandedDefinition.Properties.WindowsProfile.GetWindowsSku(), "1709") {
+		return nil, errors.New("Windows Server version 1709 hasn't been tested in a long time and is deprecated")
+	}
+
+	return nil, errors.New("Unknown Windows version. GetWindowsSku() = " + e.ExpandedDefinition.Properties.WindowsProfile.GetWindowsSku())
+}
+
 // HasAddon will return true if an addon is enabled
 func (e *Engine) HasAddon(name string) (bool, api.KubernetesAddon) {
 	for _, addon := range e.ExpandedDefinition.Properties.OrchestratorProfile.KubernetesConfig.Addons {