Skip to content

Commit 0778929

Browse files
committed
Merge branch 'master' of https://github.com/MicrosoftDocs/azure-docs-pr into ddosJan2020
2 parents 0942572 + 480e7cc commit 0778929

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

articles/aks/windows-container-cli.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ author: mlearned
66

77
ms.service: container-service
88
ms.topic: article
9-
ms.date: 06/17/2019
9+
ms.date: 01/27/2020
1010
ms.author: mlearned
1111

1212
#Customer intent: As a developer or cluster operator, I want to quickly create an AKS cluster and deploy a Windows Server container so that I can see how to run applications running on a Windows Server container using the managed Kubernetes service in Azure.
@@ -134,7 +134,7 @@ az aks create \
134134
--name myAKSCluster \
135135
--node-count 2 \
136136
--enable-addons monitoring \
137-
--kubernetes-version 1.14.6 \
137+
--kubernetes-version 1.15.7 \
138138
--generate-ssh-keys \
139139
--windows-admin-password $PASSWORD_WIN \
140140
--windows-admin-username azureuser \
@@ -160,7 +160,7 @@ az aks nodepool add \
160160
--os-type Windows \
161161
--name npwin \
162162
--node-count 1 \
163-
--kubernetes-version 1.14.6
163+
--kubernetes-version 1.15.7
164164
```
165165

166166
The above command creates a new node pool named *npwin* and adds it to the *myAKSCluster*. When creating a node pool to run Windows Server containers, the default value for *node-vm-size* is *Standard_D2s_v3*. If you choose to set the *node-vm-size* parameter, please check the list of [restricted VM sizes][restricted-vm-sizes]. The minimum recommended size is *Standard_D2s_v3*. The above command also uses the default subnet in the default vnet created when running `az aks create`.
@@ -189,8 +189,8 @@ The following example output shows the all the nodes in the cluster. Make sure t
189189

190190
```
191191
NAME STATUS ROLES AGE VERSION
192-
aks-nodepool1-12345678-vmssfedcba Ready agent 13m v1.14.6
193-
aksnpwin987654 Ready agent 108s v1.14.6
192+
aks-nodepool1-12345678-vmssfedcba Ready agent 13m v1.15.7
193+
aksnpwin987654 Ready agent 108s v1.15.7
194194
```
195195

196196
## Run the application

articles/load-balancer/TOC.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
href: quickstart-create-basic-load-balancer-powershell.md
2727
- name: Template
2828
href: load-balancer-get-started-internet-arm-template.md
29-
- name: REST API
30-
href: create-load-balancer-rest-api.md
3129

3230
- name: Tutorials
3331
items:

0 commit comments

Comments
 (0)