Skip to content

Commit 8c3c899

Browse files
authored
[aks] fix vm size model and osDiskType description (Azure#13763)
* fix: agent pool vm size should be string, not enum * fix: osDiskType default description for >= 2020-11-01
1 parent 0bf4127 commit 8c3c899

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/managedClusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1896,7 +1896,7 @@
18961896
},
18971897
"osDiskType": {
18981898
"$ref": "#/definitions/OSDiskType",
1899-
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'. May not be changed after creation."
1899+
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not be changed after creation."
19001900
},
19011901
"vnetSubnetID": {
19021902
"$ref": "#/definitions/ContainerServiceVnetSubnetID",

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-12-01/managedClusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@
21052105
},
21062106
"osDiskType": {
21072107
"$ref": "#/definitions/OSDiskType",
2108-
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'. May not be changed after creation."
2108+
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not be changed after creation."
21092109
},
21102110
"kubeletDiskType": {
21112111
"$ref": "#/definitions/KubeletDiskType",

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-02-01/managedClusters.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2117,7 +2117,7 @@
21172117
},
21182118
"osDiskType": {
21192119
"$ref": "#/definitions/OSDiskType",
2120-
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'. May not be changed after creation."
2120+
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not be changed after creation."
21212121
},
21222122
"kubeletDiskType": {
21232123
"$ref": "#/definitions/KubeletDiskType",

specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-03-01/managedClusters.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2281,7 +2281,7 @@
22812281
"description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The default value is 1."
22822282
},
22832283
"vmSize": {
2284-
"$ref": "#/definitions/ContainerServiceVMSize",
2284+
"type": "string",
22852285
"description": "Size of agent VMs."
22862286
},
22872287
"osDiskSizeGB": {
@@ -2290,7 +2290,7 @@
22902290
},
22912291
"osDiskType": {
22922292
"$ref": "#/definitions/OSDiskType",
2293-
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'. May not be changed after creation."
2293+
"description": "OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not be changed after creation."
22942294
},
22952295
"kubeletDiskType": {
22962296
"$ref": "#/definitions/KubeletDiskType",

0 commit comments

Comments
 (0)