From 8db188906357dfae1c9f8b6bbc6ff146e208e143 Mon Sep 17 00:00:00 2001 From: YanaXu Date: Mon, 28 Apr 2025 16:50:34 +0800 Subject: [PATCH] Disable setting the default NodeVmSize value --- src/Aks/Aks/ChangeLog.md | 1 + src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs | 4 ++-- src/Aks/Aks/Commands/NewAzureRmAks.cs | 1 - src/Aks/Aks/Commands/NewAzureRmAksNodePool.cs | 4 ++-- src/Aks/Aks/help/New-AzAksCluster.md | 2 +- src/Aks/Aks/help/New-AzAksNodePool.md | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/Aks/Aks/ChangeLog.md b/src/Aks/Aks/ChangeLog.md index 91781b43b207..745b9d19ce70 100644 --- a/src/Aks/Aks/ChangeLog.md +++ b/src/Aks/Aks/ChangeLog.md @@ -18,6 +18,7 @@ - Additional information about change #1 --> ## Upcoming Release +* Updated the default value of `-NodeVmSize` parameter in `New-AzAksCluster` and `-VmSize` parameter in `New-AzAksNodePool` from 'Standard_D2_V2' to being dynamically selected by the AKS resource provider based on quota and capacity in the next major release. ## Version 6.1.1 * Preannounced breaking change: The default value of `-NodeVmSize` parameter of `New-AzAksCluster` will be changing from 'Standard_DS2_V2 (Linux), Standard_DS2_V3 (Windows)' to being dynamically selected by the AKS resource provider based on quota and capacity in the next major release. diff --git a/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs b/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs index 9992451fd492..a4e4f383bad5 100644 --- a/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs +++ b/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs @@ -109,8 +109,8 @@ public abstract class CreateOrUpdateKubeBase : KubeCmdletBase [Parameter(Mandatory = false, HelpMessage = "The default number of nodes for the node pools.")] public int NodeOsDiskSize { get; set; } - [Parameter(Mandatory = false, HelpMessage = "The size of the Virtual Machine. Default value is Standard_D2_v2")] - public string NodeVmSize { get; set; } = "Standard_D2_v2"; + [Parameter(Mandatory = false, HelpMessage = "The size of the Virtual Machine. Default value is dynamically selected by the AKS resource provider based on quota and capacity.")] + public string NodeVmSize { get; set; } = ""; [Parameter(Mandatory = false, HelpMessage = "Node pool labels used for building Kubernetes network.")] public Hashtable NodePoolLabel { get; set; } diff --git a/src/Aks/Aks/Commands/NewAzureRmAks.cs b/src/Aks/Aks/Commands/NewAzureRmAks.cs index d7b53baf190c..0da41c5e87d0 100644 --- a/src/Aks/Aks/Commands/NewAzureRmAks.cs +++ b/src/Aks/Aks/Commands/NewAzureRmAks.cs @@ -35,7 +35,6 @@ namespace Microsoft.Azure.Commands.Aks { [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AksCluster", DefaultParameterSetName = DefaultParamSet, SupportsShouldProcess = true)] - [GenericBreakingChangeWithVersion("The default value of -NodeVmSize will be changing from 'Standard_DS2_V2 (Linux), Standard_DS2_V3 (Windows)' to being dynamically selected by the AKS resource provider based on quota and capacity.", "14.0.0", "7.0.0")] [OutputType(typeof(PSKubernetesCluster))] public class NewAzureRmAks : CreateOrUpdateKubeBase { diff --git a/src/Aks/Aks/Commands/NewAzureRmAksNodePool.cs b/src/Aks/Aks/Commands/NewAzureRmAksNodePool.cs index 51a7809a634c..0eb602f28dd8 100644 --- a/src/Aks/Aks/Commands/NewAzureRmAksNodePool.cs +++ b/src/Aks/Aks/Commands/NewAzureRmAksNodePool.cs @@ -54,8 +54,8 @@ public class NewAzureRmAksNodePool : NewOrUpdateAgentPoolBase [Parameter(Mandatory = false, HelpMessage = "The default number of nodes for the node pools.")] public int OsDiskSize { get; set; } - [Parameter(Mandatory = false, HelpMessage = "The size of the Virtual Machine. Default value is Standard_D2_v2.")] - public string VmSize { get; set; } = "Standard_D2_v2"; + [Parameter(Mandatory = false, HelpMessage = "The size of the Virtual Machine. Default value is dynamically selected by the AKS resource provider based on quota and capacity.")] + public string VmSize { get; set; } = ""; [Parameter(Mandatory = false, HelpMessage = "VNet SubnetID specifies the VNet's subnet identifier.")] public string VnetSubnetID { get; set; } diff --git a/src/Aks/Aks/help/New-AzAksCluster.md b/src/Aks/Aks/help/New-AzAksCluster.md index 7af6579732f9..7d862d084a38 100644 --- a/src/Aks/Aks/help/New-AzAksCluster.md +++ b/src/Aks/Aks/help/New-AzAksCluster.md @@ -1163,7 +1163,7 @@ Accept wildcard characters: False ``` ### -NodeVmSize -The size of the Virtual Machine. Default value is Standard_D2_v2. +The size of the Virtual Machine. Default value is dynamically selected by the AKS resource provider based on quota and capacity. ```yaml Type: System.String diff --git a/src/Aks/Aks/help/New-AzAksNodePool.md b/src/Aks/Aks/help/New-AzAksNodePool.md index 1c00e060b05c..9b7d3c34a87d 100644 --- a/src/Aks/Aks/help/New-AzAksNodePool.md +++ b/src/Aks/Aks/help/New-AzAksNodePool.md @@ -665,7 +665,7 @@ Accept wildcard characters: False ``` ### -VmSize -The size of the Virtual Machine. Default value is Standard_D2_v2. +The size of the Virtual Machine. Default value is dynamically selected by the AKS resource provider based on quota and capacity. ```yaml Type: System.String