change default vm sku to Standard_D2s_v3 (Azure#13541)

xizha162 · May 19, 2020 · 8e8b640 · 8e8b640
1 parent 7eb4072
commit 8e8b640
Show file tree

Hide file tree

Showing 23 changed files with 617 additions and 620 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py
@@ -1649,7 +1649,7 @@ def aks_create(cmd, client, resource_group_name, name, ssh_key_value,  # pylint:
                windows_admin_username=None,
                windows_admin_password=None,
                kubernetes_version='',
-               node_vm_size="Standard_DS2_v2",
+               node_vm_size="Standard_D2s_v3",
                node_osdisk_size=0,
                node_count=3,
                nodepool_name="nodepool1",
@@ -2835,10 +2835,7 @@ def aks_agentpool_add(cmd, client, resource_group_name, cluster_name, nodepool_n
                 raise CLIError('Taint does not match allowed values. Expect value such as "special=true:NoSchedule".')
 
     if node_vm_size is None:
-        if os_type.lower() == "windows":
-            node_vm_size = "Standard_D2s_v3"
-        else:
-            node_vm_size = "Standard_DS2_v2"
+        node_vm_size = "Standard_D2s_v3"
 
     agent_pool = AgentPool(
         name=nodepool_name,

diff --git a/...li/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml b/...li/azure/cli/command_modules/acs/tests/latest/recordings/test_aks_availability_zones.yaml
@@ -47,7 +47,7 @@ interactions:
       message: OK
 - request:
     body: '{"location": "westus2", "properties": {"kubernetesVersion": "", "dnsPrefix":
-      "cliaksdns000002", "agentPoolProfiles": [{"count": 3, "vmSize": "Standard_DS2_v2",
+      "cliaksdns000002", "agentPoolProfiles": [{"count": 3, "vmSize": "Standard_D2s_v3",
       "osType": "Linux", "type": "VirtualMachineScaleSets", "mode": "System", "availabilityZones":
       ["1", "2", "3"], "scaleSetPriority": "Regular", "scaleSetEvictionPolicy": "Delete",
       "name": "nodepool1"}], "linuxProfile": {"adminUsername": "azureuser", "ssh":
@@ -88,7 +88,7 @@ interactions:
         \  \"provisioningState\": \"Creating\",\n   \"kubernetesVersion\": \"1.15.10\"\
         ,\n   \"dnsPrefix\": \"cliaksdns000002\",\n   \"fqdn\": \"cliaksdns000002-d0bc60f1.hcp.westus2.azmk8s.io\"\
         ,\n   \"agentPoolProfiles\": [\n    {\n     \"name\": \"nodepool1\",\n   \
-        \  \"count\": 3,\n     \"vmSize\": \"Standard_DS2_v2\",\n     \"osDiskSizeGB\"\
+        \  \"count\": 3,\n     \"vmSize\": \"Standard_D2s_v3\",\n     \"osDiskSizeGB\"\
         : 100,\n     \"maxPods\": 110,\n     \"type\": \"VirtualMachineScaleSets\"\
         ,\n     \"availabilityZones\": [\n      \"1\",\n      \"2\",\n      \"3\"\n\
         \     ],\n     \"provisioningState\": \"Creating\",\n     \"orchestratorVersion\"\
@@ -602,7 +602,7 @@ interactions:
         \  \"provisioningState\": \"Succeeded\",\n   \"kubernetesVersion\": \"1.15.10\"\
         ,\n   \"dnsPrefix\": \"cliaksdns000002\",\n   \"fqdn\": \"cliaksdns000002-d0bc60f1.hcp.westus2.azmk8s.io\"\
         ,\n   \"agentPoolProfiles\": [\n    {\n     \"name\": \"nodepool1\",\n   \
-        \  \"count\": 3,\n     \"vmSize\": \"Standard_DS2_v2\",\n     \"osDiskSizeGB\"\
+        \  \"count\": 3,\n     \"vmSize\": \"Standard_D2s_v3\",\n     \"osDiskSizeGB\"\
         : 100,\n     \"maxPods\": 110,\n     \"type\": \"VirtualMachineScaleSets\"\
         ,\n     \"availabilityZones\": [\n      \"1\",\n      \"2\",\n      \"3\"\n\
         \     ],\n     \"provisioningState\": \"Succeeded\",\n     \"orchestratorVersion\"\
@@ -676,7 +676,7 @@ interactions:
         \  \"provisioningState\": \"Succeeded\",\n   \"kubernetesVersion\": \"1.15.10\"\
         ,\n   \"dnsPrefix\": \"cliaksdns000002\",\n   \"fqdn\": \"cliaksdns000002-d0bc60f1.hcp.westus2.azmk8s.io\"\
         ,\n   \"agentPoolProfiles\": [\n    {\n     \"name\": \"nodepool1\",\n   \
-        \  \"count\": 3,\n     \"vmSize\": \"Standard_DS2_v2\",\n     \"osDiskSizeGB\"\
+        \  \"count\": 3,\n     \"vmSize\": \"Standard_D2s_v3\",\n     \"osDiskSizeGB\"\
         : 100,\n     \"maxPods\": 110,\n     \"type\": \"VirtualMachineScaleSets\"\
         ,\n     \"availabilityZones\": [\n      \"1\",\n      \"2\",\n      \"3\"\n\
         \     ],\n     \"provisioningState\": \"Succeeded\",\n     \"orchestratorVersion\"\
@@ -801,7 +801,7 @@ interactions:
     body:
       string: "{\n  \"value\": [\n   {\n    \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool1\"\
         ,\n    \"name\": \"nodepool1\",\n    \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\"\
-        ,\n    \"properties\": {\n     \"count\": 3,\n     \"vmSize\": \"Standard_DS2_v2\"\
+        ,\n    \"properties\": {\n     \"count\": 3,\n     \"vmSize\": \"Standard_D2s_v3\"\
         ,\n     \"osDiskSizeGB\": 100,\n     \"maxPods\": 110,\n     \"type\": \"\
         VirtualMachineScaleSets\",\n     \"availabilityZones\": [\n      \"1\",\n\
         \      \"2\",\n      \"3\"\n     ],\n     \"provisioningState\": \"Succeeded\"\
@@ -835,7 +835,7 @@ interactions:
       code: 200
       message: OK
 - request:
-    body: '{"properties": {"count": 3, "vmSize": "Standard_DS2_v2", "osType": "Linux",
+    body: '{"properties": {"count": 3, "vmSize": "Standard_D2s_v3", "osType": "Linux",
       "type": "VirtualMachineScaleSets", "mode": "User", "availabilityZones": ["1",
       "2", "3"], "scaleSetPriority": "Regular", "scaleSetEvictionPolicy": "Delete",
       "nodeTaints": []}}'
@@ -865,7 +865,7 @@ interactions:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\
         ,\n  \"name\": \"nodepool2\",\n  \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\"\
-        ,\n  \"properties\": {\n   \"count\": 3,\n   \"vmSize\": \"Standard_DS2_v2\"\
+        ,\n  \"properties\": {\n   \"count\": 3,\n   \"vmSize\": \"Standard_D2s_v3\"\
         ,\n   \"osDiskSizeGB\": 100,\n   \"maxPods\": 110,\n   \"type\": \"VirtualMachineScaleSets\"\
         ,\n   \"availabilityZones\": [\n    \"1\",\n    \"2\",\n    \"3\"\n   ],\n\
         \   \"provisioningState\": \"Creating\",\n   \"orchestratorVersion\": \"1.15.10\"\
@@ -1207,7 +1207,7 @@ interactions:
     body:
       string: "{\n  \"id\": \"/subscriptions/00000000-0000-0000-0000-000000000000/resourcegroups/clitest000001/providers/Microsoft.ContainerService/managedClusters/cliakstest000001/agentPools/nodepool2\"\
         ,\n  \"name\": \"nodepool2\",\n  \"type\": \"Microsoft.ContainerService/managedClusters/agentPools\"\
-        ,\n  \"properties\": {\n   \"count\": 3,\n   \"vmSize\": \"Standard_DS2_v2\"\
+        ,\n  \"properties\": {\n   \"count\": 3,\n   \"vmSize\": \"Standard_D2s_v3\"\
         ,\n   \"osDiskSizeGB\": 100,\n   \"maxPods\": 110,\n   \"type\": \"VirtualMachineScaleSets\"\
         ,\n   \"availabilityZones\": [\n    \"1\",\n    \"2\",\n    \"3\"\n   ],\n\
         \   \"provisioningState\": \"Succeeded\",\n   \"orchestratorVersion\": \"\