Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[aks] fix vm size model and osDiskType description #13763

Merged
merged 2 commits into from
Apr 7, 2021
Merged

[aks] fix vm size model and osDiskType description #13763

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e9c297f
fix: agent pool vm size should be string, not enum
alexeldeib Apr 1, 2021
50210fa
fix: osDiskType default description for >= 2020-11-01
alexeldeib Apr 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-11-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1896,7 +1896,7 @@
},
"osDiskType": {
"$ref": "#/definitions/OSDiskType",
"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."
"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."
},
"vnetSubnetID": {
"$ref": "#/definitions/ContainerServiceVnetSubnetID",
Expand Down
2 changes: 1 addition & 1 deletion ...ervice/resource-manager/Microsoft.ContainerService/stable/2020-12-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2105,7 +2105,7 @@
},
"osDiskType": {
"$ref": "#/definitions/OSDiskType",
"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."
"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."
},
"kubeletDiskType": {
"$ref": "#/definitions/KubeletDiskType",
Expand Down
2 changes: 1 addition & 1 deletion ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-02-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2117,7 +2117,7 @@
},
"osDiskType": {
"$ref": "#/definitions/OSDiskType",
"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."
"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."
},
"kubeletDiskType": {
"$ref": "#/definitions/KubeletDiskType",
Expand Down
4 changes: 2 additions & 2 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-03-01/managedClusters.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2281,7 +2281,7 @@
"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."
},
"vmSize": {
"$ref": "#/definitions/ContainerServiceVMSize",
"type": "string",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should not be breaking as the enum was already model-as-string?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

and yet, the enum values were modeled in e.g. the Go SDK so this does require a client change...I thought the point of modelAsString to allow for non-breaking changes to enum values?

"description": "Size of agent VMs."
},
"osDiskSizeGB": {
Expand All @@ -2290,7 +2290,7 @@
},
"osDiskType": {
"$ref": "#/definitions/OSDiskType",
"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."
"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."
},
"kubeletDiskType": {
"$ref": "#/definitions/KubeletDiskType",
Expand Down