Skip to content

Commit 3a4ee7d

Browse files
weiliu2devweiliu2
weiliu2dev
and
weiliu2
authored
[AKS] BREAKING CHANGE: Change default vm size changes to "" and clear test cases (#31424)
Co-authored-by: weiliu2 <weiliu2@microsoft.com>
1 parent 4177017 commit 3a4ee7d

File tree

3 files changed

+4
-39
lines changed

3 files changed

+4
-39
lines changed

‎src/azure-cli/azure/cli/command_modules/acs/_consts.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
CONST_AVAILABILITY_SET = "AvailabilitySet"
4444

4545
# vm size
46-
CONST_DEFAULT_NODE_VM_SIZE = "Standard_DS2_v2"
47-
CONST_DEFAULT_WINDOWS_NODE_VM_SIZE = "Standard_D2s_v3"
46+
CONST_DEFAULT_NODE_VM_SIZE = ""
47+
CONST_DEFAULT_WINDOWS_NODE_VM_SIZE = ""
4848

4949
# gpu instance
5050
CONST_GPU_INSTANCE_PROFILE_MIG1_G = "MIG1g"

‎src/azure-cli/azure/cli/command_modules/acs/_help.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
short-summary: Secret associated with the service principal. This argument is required if `--service-principal` is specified.
6666
- name: --node-vm-size -s
6767
type: string
68-
short-summary: Size of Virtual Machines to create as Kubernetes nodes.
68+
short-summary: Size of Virtual Machines to create as Kubernetes nodes. If the user does not specify one, server will select a default VM size for her/him.
6969
- name: --dns-name-prefix -p
7070
type: string
7171
short-summary: Prefix for hostnames that are created. If not specified, generate a hostname using the managed cluster and resource group names.
@@ -1553,7 +1553,7 @@
15531553
parameters:
15541554
- name: --node-vm-size -s
15551555
type: string
1556-
short-summary: Size of Virtual Machines to create as Kubernetes nodes.
1556+
short-summary: Size of Virtual Machines to create as Kubernetes nodes. If the user does not specify one, server will select a default VM size for her/him.
15571557
- name: --node-count -c
15581558
type: int
15591559
short-summary: Number of nodes in the Kubernetes agent pool. After creating a cluster, you can change the size of its node pool with `az aks scale`.

‎src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py‎

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,6 @@ def test_aks_create_default(self, resource_group, resource_group_location):
244244
self.exists('fqdn'),
245245
self.check('agentPoolProfiles[0].count', 1),
246246
self.check('agentPoolProfiles[0].osType', 'Linux'),
247-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
248247
self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'),
249248
self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'),
250249
self.check('agentPoolProfiles[0].tags.tag1', 'tv1'),
@@ -334,7 +333,6 @@ def test_aks_create_default_sp(self, resource_group, resource_group_location, sp
334333
self.exists('fqdn'),
335334
self.check('agentPoolProfiles[0].count', 1),
336335
self.check('agentPoolProfiles[0].osType', 'Linux'),
337-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
338336
self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'),
339337
self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'),
340338
self.check('agentPoolProfiles[0].tags.tag1', 'tv1'),
@@ -750,7 +748,6 @@ def test_aks_create_default_service(self, resource_group, resource_group_locatio
750748
self.check('resourceGroup', '{resource_group}'),
751749
self.check('agentPoolProfiles[0].count', 1),
752750
self.check('agentPoolProfiles[0].osType', 'Linux'),
753-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
754751
self.check('agentPoolProfiles[0].maxPods', 100),
755752
self.check('dnsPrefix', '{dns_name_prefix}'),
756753
self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'),
@@ -828,7 +825,6 @@ def test_aks_create_service_no_wait(self, resource_group, resource_group_locatio
828825
self.check('name', '{name}'),
829826
self.check('resourceGroup', '{resource_group}'),
830827
self.check('agentPoolProfiles[0].count', 1),
831-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
832828
self.check('dnsPrefix', '{dns_name_prefix}'),
833829
self.check('provisioningState', 'Succeeded'),
834830
])
@@ -862,7 +858,6 @@ def test_aks_create_service_no_wait(self, resource_group, resource_group_locatio
862858
self.check('name', '{name}'),
863859
self.check('resourceGroup', '{resource_group}'),
864860
self.check('agentPoolProfiles[0].count', 1),
865-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
866861
self.check('dnsPrefix', '{dns_name_prefix}'),
867862
self.check('provisioningState', 'Succeeded'),
868863
self.check('addonProfiles.httpApplicationRouting.enabled', True)
@@ -1140,7 +1135,6 @@ def test_aks_create_default_service_with_monitoring_addon(self, resource_group,
11401135
self.check('resourceGroup', '{resource_group}'),
11411136
self.check('agentPoolProfiles[0].count', 1),
11421137
self.check('agentPoolProfiles[0].osType', 'Linux'),
1143-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
11441138
self.check('dnsPrefix', '{dns_name_prefix}'),
11451139
self.exists('kubernetesVersion'),
11461140
self.check('addonProfiles.omsagent.enabled', True),
@@ -1181,7 +1175,6 @@ def test_aks_create_default_service_with_monitoring_addon(self, resource_group,
11811175
self.check('resourceGroup', '{resource_group}'),
11821176
self.check('agentPoolProfiles[0].count', 1),
11831177
self.check('agentPoolProfiles[0].osType', 'Linux'),
1184-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
11851178
self.check('dnsPrefix', '{dns_name_prefix}'),
11861179
self.exists('kubernetesVersion'),
11871180
self.check('addonProfiles.omsagent.enabled', True),
@@ -1239,7 +1232,6 @@ def test_aks_create_default_service_with_virtual_node_addon(self, resource_group
12391232
self.check('resourceGroup', '{resource_group}'),
12401233
self.check('agentPoolProfiles[0].count', 1),
12411234
self.check('agentPoolProfiles[0].osType', 'Linux'),
1242-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
12431235
self.check('dnsPrefix', '{dns_name_prefix}'),
12441236
self.exists('kubernetesVersion'),
12451237
self.check('addonProfiles.aciConnectorLinux.enabled', True),
@@ -1275,7 +1267,6 @@ def test_aks_create_default_service_with_virtual_node_addon(self, resource_group
12751267
self.check('resourceGroup', '{resource_group}'),
12761268
self.check('agentPoolProfiles[0].count', 1),
12771269
self.check('agentPoolProfiles[0].osType', 'Linux'),
1278-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
12791270
self.check('dnsPrefix', '{dns_name_prefix}'),
12801271
self.exists('kubernetesVersion'),
12811272
self.check('addonProfiles.aciConnectorLinux.enabled', True),
@@ -1339,7 +1330,6 @@ def test_aks_create_blb_vmas(self, resource_group, resource_group_location, sp_n
13391330
self.check('resourceGroup', '{resource_group}'),
13401331
self.check('agentPoolProfiles[0].count', 1),
13411332
self.check('agentPoolProfiles[0].osType', 'Linux'),
1342-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
13431333
self.check('agentPoolProfiles[0].type', 'AvailabilitySet'),
13441334
self.check('dnsPrefix', '{dns_name_prefix}'),
13451335
self.exists('kubernetesVersion'),
@@ -1413,7 +1403,6 @@ def test_aks_create_default_setting(self, resource_group, resource_group_locatio
14131403
self.check('resourceGroup', '{resource_group}'),
14141404
self.check('agentPoolProfiles[0].count', 1),
14151405
self.check('agentPoolProfiles[0].osType', 'Linux'),
1416-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
14171406
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
14181407
self.check('dnsPrefix', '{dns_name_prefix}'),
14191408
self.exists('kubernetesVersion'),
@@ -1504,7 +1493,6 @@ def test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update(self, reso
15041493
self.check('resourceGroup', '{resource_group}'),
15051494
self.check('agentPoolProfiles[0].count', 1),
15061495
self.check('agentPoolProfiles[0].osType', 'Linux'),
1507-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
15081496
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
15091497
self.check('dnsPrefix', '{dns_name_prefix}'),
15101498
self.exists('kubernetesVersion'),
@@ -1620,7 +1608,6 @@ def test_aks_create_slb_vmss_with_outbound_ip_then_update(self, resource_group,
16201608
self.check('resourceGroup', '{resource_group}'),
16211609
self.check('agentPoolProfiles[0].count', 1),
16221610
self.check('agentPoolProfiles[0].osType', 'Linux'),
1623-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
16241611
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
16251612
self.check('dnsPrefix', '{dns_name_prefix}'),
16261613
self.exists('kubernetesVersion'),
@@ -1727,7 +1714,6 @@ def test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update(self, resourc
17271714
self.check('resourceGroup', '{resource_group}'),
17281715
self.check('agentPoolProfiles[0].count', 1),
17291716
self.check('agentPoolProfiles[0].osType', 'Linux'),
1730-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
17311717
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
17321718
self.check('dnsPrefix', '{dns_name_prefix}'),
17331719
self.exists('kubernetesVersion'),
@@ -1815,7 +1801,6 @@ def test_aks_nodepool_create_scale_delete(self, resource_group, resource_group_l
18151801
self.check('resourceGroup', '{resource_group}'),
18161802
self.check('agentPoolProfiles[0].count', 1),
18171803
self.check('agentPoolProfiles[0].osType', 'Linux'),
1818-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
18191804
self.check('agentPoolProfiles[0].mode', 'System'),
18201805
self.check('dnsPrefix', '{dns_name_prefix}'),
18211806
self.exists('kubernetesVersion')
@@ -1947,7 +1932,6 @@ def test_aks_nodepool_system_pool(self, resource_group, resource_group_location,
19471932
self.check('resourceGroup', '{resource_group}'),
19481933
self.check('agentPoolProfiles[0].count', 1),
19491934
self.check('agentPoolProfiles[0].osType', 'Linux'),
1950-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
19511935
self.check('agentPoolProfiles[0].mode', 'System'),
19521936
self.check('dnsPrefix', '{dns_name_prefix}'),
19531937
self.exists('kubernetesVersion')
@@ -2064,7 +2048,6 @@ def test_aks_availability_zones(self, resource_group, resource_group_location, s
20642048
self.check('resourceGroup', '{resource_group}'),
20652049
self.check('agentPoolProfiles[0].count', 3),
20662050
self.check('agentPoolProfiles[0].osType', 'Linux'),
2067-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
20682051
self.check('agentPoolProfiles[0].availabilityZones[0]', '1'),
20692052
self.check('agentPoolProfiles[0].availabilityZones[1]', '2'),
20702053
self.check('agentPoolProfiles[0].availabilityZones[2]', '3'),
@@ -2836,7 +2819,6 @@ def test_aks_managed_identity_without_service_principal(self, resource_group, re
28362819
self.check('resourceGroup', '{resource_group}'),
28372820
self.check('agentPoolProfiles[0].count', 1),
28382821
self.check('agentPoolProfiles[0].osType', 'Linux'),
2839-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
28402822
self.check('dnsPrefix', '{dns_name_prefix}'),
28412823
self.exists('kubernetesVersion'),
28422824
self.exists('identity'),
@@ -3513,7 +3495,6 @@ def test_aks_control_plane_user_assigned_identity(self, resource_group, resource
35133495
self.check('resourceGroup', '{resource_group}'),
35143496
self.check('agentPoolProfiles[0].count', 1),
35153497
self.check('agentPoolProfiles[0].osType', 'Linux'),
3516-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
35173498
self.check('dnsPrefix', '{dns_name_prefix}'),
35183499
self.exists('kubernetesVersion'),
35193500
self.exists('identityProfile'),
@@ -3804,7 +3785,6 @@ def test_aks_create_default_service_msi(self, resource_group, resource_group_loc
38043785
self.check('resourceGroup', '{resource_group}'),
38053786
self.check('agentPoolProfiles[0].count', 1),
38063787
self.check('agentPoolProfiles[0].osType', 'Linux'),
3807-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
38083788
self.check('dnsPrefix', '{dns_name_prefix}'),
38093789
self.check('agentPoolProfiles[0].nodeLabels.label1', 'value1'),
38103790
self.check('agentPoolProfiles[0].nodeLabels.label2', 'value2'),
@@ -3875,7 +3855,6 @@ def test_aks_create_service_no_wait_msi(self, resource_group, resource_group_loc
38753855
self.check('name', '{name}'),
38763856
self.check('resourceGroup', '{resource_group}'),
38773857
self.check('agentPoolProfiles[0].count', 1),
3878-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
38793858
self.check('dnsPrefix', '{dns_name_prefix}'),
38803859
self.check('provisioningState', 'Succeeded'),
38813860
])
@@ -3909,7 +3888,6 @@ def test_aks_create_service_no_wait_msi(self, resource_group, resource_group_loc
39093888
self.check('name', '{name}'),
39103889
self.check('resourceGroup', '{resource_group}'),
39113890
self.check('agentPoolProfiles[0].count', 1),
3912-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
39133891
self.check('dnsPrefix', '{dns_name_prefix}'),
39143892
self.check('provisioningState', 'Succeeded'),
39153893
self.check('addonProfiles.httpApplicationRouting.enabled', True)
@@ -4070,7 +4048,6 @@ def test_aks_create_default_service_with_monitoring_addon_msi(self, resource_gro
40704048
self.check('resourceGroup', '{resource_group}'),
40714049
self.check('agentPoolProfiles[0].count', 1),
40724050
self.check('agentPoolProfiles[0].osType', 'Linux'),
4073-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
40744051
self.check('dnsPrefix', '{dns_name_prefix}'),
40754052
self.exists('kubernetesVersion'),
40764053
self.check('addonProfiles.omsagent.enabled', True),
@@ -4111,7 +4088,6 @@ def test_aks_create_default_service_with_monitoring_addon_msi(self, resource_gro
41114088
self.check('resourceGroup', '{resource_group}'),
41124089
self.check('agentPoolProfiles[0].count', 1),
41134090
self.check('agentPoolProfiles[0].osType', 'Linux'),
4114-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
41154091
self.check('dnsPrefix', '{dns_name_prefix}'),
41164092
self.exists('kubernetesVersion'),
41174093
self.check('addonProfiles.omsagent.enabled', True),
@@ -4174,7 +4150,6 @@ def test_aks_create_blb_vmas_msi(self, resource_group, resource_group_location):
41744150
self.check('resourceGroup', '{resource_group}'),
41754151
self.check('agentPoolProfiles[0].count', 1),
41764152
self.check('agentPoolProfiles[0].osType', 'Linux'),
4177-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
41784153
self.check('agentPoolProfiles[0].type', 'AvailabilitySet'),
41794154
self.check('dnsPrefix', '{dns_name_prefix}'),
41804155
self.exists('kubernetesVersion'),
@@ -4244,7 +4219,6 @@ def test_aks_create_default_setting_msi(self, resource_group, resource_group_loc
42444219
self.check('resourceGroup', '{resource_group}'),
42454220
self.check('agentPoolProfiles[0].count', 1),
42464221
self.check('agentPoolProfiles[0].osType', 'Linux'),
4247-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
42484222
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
42494223
self.check('dnsPrefix', '{dns_name_prefix}'),
42504224
self.exists('kubernetesVersion'),
@@ -4331,7 +4305,6 @@ def test_aks_create_slb_vmss_with_default_mgd_outbound_ip_then_update_msi(self,
43314305
self.check('resourceGroup', '{resource_group}'),
43324306
self.check('agentPoolProfiles[0].count', 1),
43334307
self.check('agentPoolProfiles[0].osType', 'Linux'),
4334-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
43354308
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
43364309
self.check('dnsPrefix', '{dns_name_prefix}'),
43374310
self.exists('kubernetesVersion'),
@@ -4443,7 +4416,6 @@ def test_aks_create_slb_vmss_with_outbound_ip_then_update_msi(self, resource_gro
44434416
self.check('resourceGroup', '{resource_group}'),
44444417
self.check('agentPoolProfiles[0].count', 1),
44454418
self.check('agentPoolProfiles[0].osType', 'Linux'),
4446-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
44474419
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
44484420
self.check('dnsPrefix', '{dns_name_prefix}'),
44494421
self.exists('kubernetesVersion'),
@@ -4546,7 +4518,6 @@ def test_aks_create_slb_vmss_with_outbound_ip_prefixes_then_update_msi(self, res
45464518
self.check('resourceGroup', '{resource_group}'),
45474519
self.check('agentPoolProfiles[0].count', 1),
45484520
self.check('agentPoolProfiles[0].osType', 'Linux'),
4549-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
45504521
self.check('agentPoolProfiles[0].type', 'VirtualMachineScaleSets'),
45514522
self.check('dnsPrefix', '{dns_name_prefix}'),
45524523
self.exists('kubernetesVersion'),
@@ -4628,7 +4599,6 @@ def test_aks_nodepool_create_scale_delete_msi(self, resource_group, resource_gro
46284599
self.check('resourceGroup', '{resource_group}'),
46294600
self.check('agentPoolProfiles[0].count', 1),
46304601
self.check('agentPoolProfiles[0].osType', 'Linux'),
4631-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
46324602
self.check('agentPoolProfiles[0].mode', 'System'),
46334603
self.check('dnsPrefix', '{dns_name_prefix}'),
46344604
self.exists('kubernetesVersion')
@@ -4750,7 +4720,6 @@ def test_aks_nodepool_system_pool_msi(self, resource_group, resource_group_locat
47504720
self.check('resourceGroup', '{resource_group}'),
47514721
self.check('agentPoolProfiles[0].count', 1),
47524722
self.check('agentPoolProfiles[0].osType', 'Linux'),
4753-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
47544723
self.check('agentPoolProfiles[0].mode', 'System'),
47554724
self.check('dnsPrefix', '{dns_name_prefix}'),
47564725
self.exists('kubernetesVersion')
@@ -4864,7 +4833,6 @@ def test_aks_nodepool_update_label_msi(self, resource_group, resource_group_loca
48644833
self.check('resourceGroup', '{resource_group}'),
48654834
self.check('agentPoolProfiles[0].count', 1),
48664835
self.check('agentPoolProfiles[0].osType', 'Linux'),
4867-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
48684836
self.check('agentPoolProfiles[0].mode', 'System'),
48694837
self.check('dnsPrefix', '{dns_name_prefix}'),
48704838
self.exists('kubernetesVersion')
@@ -4958,7 +4926,6 @@ def test_aks_nodepool_update_taints_msi(self, resource_group, resource_group_loc
49584926
self.check('resourceGroup', '{resource_group}'),
49594927
self.check('agentPoolProfiles[0].count', 1),
49604928
self.check('agentPoolProfiles[0].osType', 'Linux'),
4961-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
49624929
self.check('agentPoolProfiles[0].mode', 'System'),
49634930
self.check('dnsPrefix', '{dns_name_prefix}'),
49644931
self.exists('kubernetesVersion')
@@ -5179,7 +5146,6 @@ def test_aks_nodepool_scale_down_mode(self, resource_group, resource_group_locat
51795146
self.check('resourceGroup', '{resource_group}'),
51805147
self.check('agentPoolProfiles[0].count', 1),
51815148
self.check('agentPoolProfiles[0].osType', 'Linux'),
5182-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
51835149
self.check('agentPoolProfiles[0].mode', 'System'),
51845150
self.check('dnsPrefix', '{dns_name_prefix}'),
51855151
self.exists('kubernetesVersion')
@@ -5268,7 +5234,6 @@ def test_aks_availability_zones_msi(self, resource_group, resource_group_locatio
52685234
self.check('resourceGroup', '{resource_group}'),
52695235
self.check('agentPoolProfiles[0].count', 3),
52705236
self.check('agentPoolProfiles[0].osType', 'Linux'),
5271-
self.check('agentPoolProfiles[0].vmSize', 'Standard_DS2_v2'),
52725237
self.check('agentPoolProfiles[0].availabilityZones[0]', '1'),
52735238
self.check('agentPoolProfiles[0].availabilityZones[1]', '2'),
52745239
self.check('agentPoolProfiles[0].availabilityZones[2]', '3'),

0 commit comments

Comments
 (0)