update images to 1803 (#2958)

Azure · May 15, 2018 · b391c25 · b391c25
1 parent 7c46bea
commit b391c25
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/docs/kubernetes/windows.md b/docs/kubernetes/windows.md
@@ -132,7 +132,7 @@ After completing this walkthrough you will know how to:
       spec:
         containers:
         - name: windowswebserver
-          image: microsoft/windowsservercore:1709
+          image: microsoft/windowsservercore:1803
           command:
           - powershell.exe
           - -command
@@ -253,7 +253,7 @@ spec:
       containers:
 
         - name: iis-container
-          image: microsoft/iis:windowsservercore-1709
+          image: microsoft/iis:windowsservercore-1803
           volumeMounts:
           - name: shared-data
             mountPath: /wwwcache
@@ -263,7 +263,7 @@ spec:
           - "while ($true) { Start-Sleep -Seconds 10; Copy-Item -Path C:\\wwwcache\\iisstart.htm -Destination C:\\inetpub\\wwwroot\\iisstart.htm; }"            
 
         - name: servercore-container
-          image: microsoft/windowsservercore:1709
+          image: microsoft/windowsservercore:1803
           volumeMounts:
           - name: shared-data
             mountPath: /poddata

diff --git a/parts/k8s/kubernetesmastervars.t b/parts/k8s/kubernetesmastervars.t
@@ -456,7 +456,7 @@
     "windowsTelemetryGUID": "[parameters('windowsTelemetryGUID')]",
     "agentWindowsPublisher": "MicrosoftWindowsServer",
     "agentWindowsOffer": "WindowsServerSemiAnnual",
-    "agentWindowsSku": "Datacenter-Core-1709-with-Containers-smalldisk",
+    "agentWindowsSku": "Datacenter-Core-1803-with-Containers-smalldisk",
     "agentWindowsVersion": "[parameters('agentWindowsVersion')]",
     "windowsCustomScriptSuffix": " $inputFile = '%SYSTEMDRIVE%\\AzureData\\CustomData.bin' ; $outputFile = '%SYSTEMDRIVE%\\AzureData\\CustomDataSetupScript.ps1' ; Copy-Item $inputFile $outputFile ; Invoke-Expression('{0} {1}' -f $outputFile, $arguments) ; "
 {{end}}

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

diff --git a/test/cluster-tests/kubernetes/simpleweb-windows.yaml b/test/cluster-tests/kubernetes/simpleweb-windows.yaml
@@ -29,7 +29,7 @@ spec:
     spec:
       containers:
       - name: windowswebserver
-        image: microsoft/windowsservercore:1709
+        image: microsoft/windowsservercore:1803
         command:
         - powershell.exe
         - -command

diff --git a/test/e2e/kubernetes/workloads/iis-azurefile.yaml b/test/e2e/kubernetes/workloads/iis-azurefile.yaml
@@ -7,7 +7,7 @@ metadata:
     name: storage
 spec:
   containers:
-  - image: microsoft/iis:windowsservercore-1709
+  - image: microsoft/iis:windowsservercore-1803
     name: iis-azurefile
     volumeMounts:
     - name: azurefilevol

diff --git a/windows/Dockerfile b/windows/Dockerfile
@@ -1,3 +1,3 @@
-FROM microsoft/nanoserver:1709
+FROM microsoft/nanoserver:1803
 
 CMD cmd /c ping -t localhost