Azure · dingmeng-xue · Oct 20, 2020 · Oct 18, 2020 · Oct 19, 2020
diff --git a/src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1 b/src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1
@@ -16,19 +16,19 @@ function Test-NewAzAksSimple
 
         if (IsLive) {
             $cred = $(createTestCredential "Unicorns" "Puppies")
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -ClientIdAndSecret $cred
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -ClientIdAndSecret $cred
         } else {
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize
         }
-        $cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+        $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-NotNull $cluster.Fqdn
         Assert-NotNull $cluster.DnsPrefix
         Assert-AreEqual 1 $cluster.AgentPoolProfiles.Length
         Assert-AreEqual 3 $cluster.AgentPoolProfiles[0].Count;
-        $cluster = $cluster | Set-AzAks -NodeCount 2
+        $cluster = $cluster | Set-AzAksCluster -NodeCount 2
         Assert-AreEqual 2 $cluster.AgentPoolProfiles[0].Count;
         $cluster | Import-AzAksCredential -Force
-        $cluster | Remove-AzAks -Force
+        $cluster | Remove-AzAksCluster -Force
     }
     finally
     {
@@ -53,19 +53,19 @@ function Test-NewAzAksWithAcr
 
         if (IsLive) {
             $cred = $(createTestCredential "Unicorns" "Puppies")
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -ClientIdAndSecret $cred -AcrNameToAttach $acrName
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -ClientIdAndSecret $cred -AcrNameToAttach $acrName
         } else {
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -AcrNameToAttach $acrName
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeVmSize $nodeVmSize -AcrNameToAttach $acrName
         }
-        $cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+        $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-NotNull $cluster.Fqdn
         Assert-NotNull $cluster.DnsPrefix
         Assert-AreEqual 1 $cluster.AgentPoolProfiles.Length
         Assert-AreEqual 3 $cluster.AgentPoolProfiles[0].Count;
         $cluster = $cluster | Set-AzAks -NodeCount 2
         Assert-AreEqual 2 $cluster.AgentPoolProfiles[0].Count;
         $cluster | Import-AzAksCredential -Force
-        $cluster | Remove-AzAks -Force
+        $cluster | Remove-AzAksCluster -Force
     }
     finally
     {
@@ -103,17 +103,17 @@ function Test-NewAzAks
 
         if (IsLive) {
             $cred = $(createTestCredential "Unicorns" "Puppies")
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin `
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin `
                 -KubernetesVersion $kubeVersion -EnableRbac -LoadBalancerSku $loadBalancerSku -LinuxProfileAdminUserName $linuxAdminUser -DnsNamePrefix $dnsNamePrefix `
-                -NodeName $nodeName -NodeOsType $nodeOsType -EnableNodeAutoScaling -NodeCount $nodeCount -NodeOsDiskSize $nodeDiskSize -NodeVmSize $nodeVmSize `
+                -NodeName $nodeName -EnableNodeAutoScaling -NodeCount $nodeCount -NodeOsDiskSize $nodeDiskSize -NodeVmSize $nodeVmSize `
                 -NodeMaxCount $nodeMaxCount -NodeMinCount $nodeMinCount -NodeMaxPodCount $maxPodCount -NodeSetPriority Regular -NodeScaleSetEvictionPolicy Deallocate -NodeVmSetType VirtualMachineScaleSets
          } else {
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin `
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin `
                 -KubernetesVersion $kubeVersion -EnableRbac -LoadBalancerSku $loadBalancerSku -LinuxProfileAdminUserName $linuxAdminUser -DnsNamePrefix $dnsNamePrefix `
-                -NodeName $nodeName -NodeOsType $nodeOsType -EnableNodeAutoScaling -NodeCount $nodeCount -NodeOsDiskSize $nodeDiskSize -NodeVmSize $nodeVmSize `
+                -NodeName $nodeName -EnableNodeAutoScaling -NodeCount $nodeCount -NodeOsDiskSize $nodeDiskSize -NodeVmSize $nodeVmSize `
                 -NodeMaxCount $nodeMaxCount -NodeMinCount $nodeMinCount -NodeMaxPodCount $maxPodCount -NodeSetPriority Regular -NodeScaleSetEvictionPolicy Deallocate -NodeVmSetType VirtualMachineScaleSets
         }
-        $cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+        $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-NotNull $cluster.Fqdn
         Assert-AreEqual $dnsNamePrefix $cluster.DnsPrefix
         Assert-AreEqual $kubeVersion $cluster.KubernetesVersion
@@ -133,12 +133,12 @@ function Test-NewAzAks
         Assert-AreEqual $enableAutoScaling $cluster.AgentPoolProfiles[0].EnableAutoScaling
 
         Assert-AreEqual 1 $cluster.AgentPoolProfiles.Length
-        $cluster = $cluster | Set-AzAks -NodeName $nodeName -NodeMinCount 2 -NodeMaxCount 28 -KubernetesVersion $updatedKubeVersion
+        $cluster = $cluster | Set-AzAksCluster -NodeName $nodeName -NodeMinCount 2 -NodeMaxCount 28 -KubernetesVersion $updatedKubeVersion
         Assert-AreEqual 2 $cluster.AgentPoolProfiles[0].MinCount
         Assert-AreEqual 28 $cluster.AgentPoolProfiles[0].MaxCount;
         Assert-AreEqual $updatedKubeVersion $cluster.KubernetesVersion
         $cluster | Import-AzAksCredential -Force
-        $cluster | Remove-AzAks -Force
+        $cluster | Remove-AzAksCluster -Force
     }
     finally
     {
@@ -157,16 +157,16 @@ function Test-NewAzAksAddons
     {
         New-AzResourceGroup -Name $resourceGroupName -Location $location
 
-        New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -AddOnNameToBeEnabled KubeDashboard,HttpApplicationRouting
-        $cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+        New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -AddOnNameToBeEnabled KubeDashboard,HttpApplicationRouting
+        $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-AreEqual $true $cluster.AddonProfiles['httpapplicationrouting'].Enabled
         Assert-AreEqual $true $cluster.AddonProfiles['httpapplicationrouting'].Enabled
 
         $cluster = $cluster | Disable-AzAksAddon -Name HttpApplicationRouting
         Assert-AreEqual $false $cluster.AddonProfiles['httpapplicationrouting'].Enabled
         $cluster = $cluster | Enable-AzAksAddon -Name HttpApplicationRouting
         Assert-AreEqual $true $cluster.AddonProfiles['httpapplicationrouting'].Enabled
-        $cluster | Remove-AzAks -Force
+        $cluster | Remove-AzAksCluster -Force
     }
     finally
     {

diff --git a/src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1 b/src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1
@@ -25,14 +25,14 @@ function Test-NewNodePool
         #new cluster
         if (IsLive) {
             $cred = $(createTestCredential "Unicorns" "Puppies")
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred -NetworkPlugin $networkPlugin `
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred -NetworkPlugin $networkPlugin `
                 -KubernetesVersion $kubeVersion -NodeVmSetType $nodeVmSetType -WindowsProfileAdminUserName $winAdminUser `
                 -WindowsProfileAdminUserPassword $winPassword
         } else {
-            New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin -KubernetesVersion $kubeVersion
+            New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin -KubernetesVersion $kubeVersion
         }
 
-        $cluster = Get-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+        $cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
         Assert-AreEqual $networkPlugin $cluster.NetworkProfile.NetworkPlugin
         Assert-AreEqual $nodeOsType $cluster.AgentPoolProfiles[0].OsType
         Assert-AreEqual 1 $cluster.AgentPoolProfiles.Count
@@ -53,7 +53,7 @@ function Test-NewNodePool
         Assert-AreEqual $kubeVersion $updatedWinPool.OrchestratorVersion
 
         $updatedWinPool | Remove-AzAksNodePool -Force
-        $cluster | Remove-AzAks -Force
+        $cluster | Remove-AzAksCluster -Force
     }
     finally
     {

diff --git a/src/Aks/Aks/ChangeLog.md b/src/Aks/Aks/ChangeLog.md
@@ -18,6 +18,12 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* [Breaking Change] Removed cmdlet alias `Get-AzAks`, `New-AzAks`, `Remove-AzAks` and `Set-AzAks`.
+* [Breaking Change] Removed parameter alias `ClientIdAndSecret` in `New-AzAksCluster` and `Set-AzAksCluster`.
+* [Breaking Change] Changed the default value of `NodeVmSetType` in `New-AzAksCluster` from `AvailabilitySet` to `VirtualMachineScaleSets`.
+* [Breaking Change] Changed the default value of `NetworkPlugin` in `New-AzAksCluster` from `None` to `azure`.
+* [Breaking Change] Removed parameter `NodeOsType` in `New-AzAksCluster` as it supports only one value Linux.
+
 
 ## Version 1.3.0
 * Added client side parameter validation logic for `New-AzAksCluster`, `Set-AzAksCluster` and `New-AzAksNodePool`. [#12372]

diff --git a/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs b/src/Aks/Aks/Commands/CreateOrUpdateKubeBase.cs
@@ -70,8 +70,6 @@ public abstract class CreateOrUpdateKubeBase : KubeCmdletBase
             Mandatory = false,
             ParameterSetName = DefaultParamSet,
             HelpMessage = "The client id and client secret associated with the AAD application / service principal.")]
-        [Alias("ClientIdAndSecret")]
-        [CmdletParameterBreakingChange("ClientIdAndSecret", ReplaceMentCmdletParameterName = "ServicePrincipalIdAndSecret")]
         public PSCredential ServicePrincipalIdAndSecret { get; set; }
 
         [Parameter(Mandatory = false,

diff --git a/src/Aks/Aks/Commands/GetAzureRmAks.cs b/src/Aks/Aks/Commands/GetAzureRmAks.cs
@@ -25,9 +25,7 @@
 
 namespace Microsoft.Azure.Commands.Aks
 {
-    [CmdletDeprecation(ReplacementCmdletName = "Get-AzAksCluster")]
     [Cmdlet("Get", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AksCluster", DefaultParameterSetName = ResourceGroupParameterSet)]
-    [Alias("Get-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Aks")]
     [OutputType(typeof(PSKubernetesCluster))]
     public class GetAzureRmAks : KubeCmdletBase
     {

diff --git a/src/Aks/Aks/Commands/NewAzureRmAks.cs b/src/Aks/Aks/Commands/NewAzureRmAks.cs
@@ -26,9 +26,7 @@
 
 namespace Microsoft.Azure.Commands.Aks
 {
-    [CmdletDeprecation(ReplacementCmdletName = "New-AzAksCluster")]
     [Cmdlet("New", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AksCluster", DefaultParameterSetName = DefaultParamSet, SupportsShouldProcess = true)]
-    [Alias("New-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Aks")]
     [OutputType(typeof(PSKubernetesCluster))]
     public class NewAzureRmAks : NewKubeBase
     {
@@ -101,11 +99,6 @@ private void PreValidate()
                     throw new ArgumentException(Resources.NetworkPluginShouldBeAzure);
                 }
             }
-            if (string.Equals(this.NodeOsType, "Windows"))
-            {
-                if (NodeName?.Length > 6)
-                    throw new PSInvalidOperationException(Resources.WindowsNodePoolNameLengthLimitation);
-            }
         }
 
         private void VerifySshKeyGenBinaryExist()

diff --git a/src/Aks/Aks/Commands/NewKubeBase.cs b/src/Aks/Aks/Commands/NewKubeBase.cs
@@ -31,7 +31,6 @@ namespace Microsoft.Azure.Commands.Aks
 {
     public abstract class NewKubeBase : CreateOrUpdateKubeBase
     {
-        [CmdletParameterBreakingChange("NodeVmSetType", ChangeDescription = "Default value will be changed from AvailabilitySet to VirtualMachineScaleSets.")]
         [Parameter(Mandatory = false, HelpMessage = "Represents types of an node pool. Possible values include: 'VirtualMachineScaleSets', 'AvailabilitySet'")]
         [PSArgumentCompleter("AvailabilitySet", "VirtualMachineScaleSets")]
         public string NodeVmSetType { get; set; }
@@ -42,11 +41,6 @@ public abstract class NewKubeBase : CreateOrUpdateKubeBase
         [Parameter(Mandatory = false, HelpMessage = "Maximum number of pods that can run on node.")]
         public int NodeMaxPodCount { get; set; }
 
-        [CmdletParameterBreakingChange("NodeOsType", ChangeDescription = "NodeOsType will be removed as it supports only one value Linux.")]
-        [Parameter(Mandatory = false, HelpMessage = "OsType to be used to specify os type, currently support 'Linux' only here.")]
-        [PSArgumentCompleter("Linux")]
-        public string NodeOsType { get; set; }
-
         ////Hide it as it expects GA by around May
         //[Parameter(Mandatory = false, HelpMessage = "Whether to enable public IP for nodes")]
         //public SwitchParameter EnableNodePublicIp { get; set; }
@@ -120,10 +114,9 @@ public abstract class NewKubeBase : CreateOrUpdateKubeBase
         [ValidateSecureString(RegularExpression = "^(?=.*[a-z])(?=.*[A-Z])(?=.*[!@#$%\\^&\\*\\(\\)])[a-zA-Z\\d!@#$%\\^&\\*\\(\\)]{12,123}$")]
         public SecureString WindowsProfileAdminUserPassword { get; set; }
 
-        [CmdletParameterBreakingChange("NetworkPlugin", ChangeDescription = "Default value will be changed from None to azure.")]
         [Parameter(Mandatory = false, HelpMessage = "Network plugin used for building Kubernetes network.")]
         [PSArgumentCompleter("azure", "kubenet")]
-        public string NetworkPlugin { get; set; }
+        public string NetworkPlugin { get; set; } = "azure";
 
         [Parameter(Mandatory = false, HelpMessage = "The load balancer sku for the managed cluster.")]
         [PSArgumentCompleter("basic", "standard")]
@@ -217,12 +210,9 @@ private ManagedClusterAgentPoolProfile GetAgentPoolProfile()
                 count: NodeCount,
                 vmSize: NodeVmSize,
                 osDiskSizeGB: NodeOsDiskSize,
-                type: NodeVmSetType ?? "AvailabilitySet",
+                type: NodeVmSetType ?? "VirtualMachineScaleSets",
                 vnetSubnetID: NodeVnetSubnetID);
-            if (this.IsParameterBound(c => c.NodeOsType))
-            {
-                defaultAgentPoolProfile.OsType = NodeOsType;
-            }
+            defaultAgentPoolProfile.OsType = "Linux";
             if (this.IsParameterBound(c => c.NodeMaxPodCount))
             {
                 defaultAgentPoolProfile.MaxPods = NodeMaxPodCount;

diff --git a/src/Aks/Aks/Commands/RemoveAzureRmAks.cs b/src/Aks/Aks/Commands/RemoveAzureRmAks.cs
@@ -22,9 +22,7 @@
 
 namespace Microsoft.Azure.Commands.Aks
 {
-    [CmdletDeprecation(ReplacementCmdletName = "Remove-AzAksCluster")]
     [Cmdlet("Remove", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AksCluster", SupportsShouldProcess = true, DefaultParameterSetName = GroupNameParameterSet)]
-    [Alias("Remove-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Aks")]
     [OutputType(typeof(bool))]
     public class RemoveAzureRmAks : KubeCmdletBase
     {

diff --git a/src/Aks/Aks/Commands/SetAzureRmAks.cs b/src/Aks/Aks/Commands/SetAzureRmAks.cs
@@ -27,9 +27,7 @@
 
 namespace Microsoft.Azure.Commands.Aks
 {
-    [CmdletDeprecation(ReplacementCmdletName = "Set-AzAksCluster")]
     [Cmdlet("Set", ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "AksCluster", DefaultParameterSetName = DefaultParamSet, SupportsShouldProcess = true)]
-    [Alias("Set-" + ResourceManager.Common.AzureRMConstants.AzureRMPrefix + "Aks")]
     [OutputType(typeof(PSKubernetesCluster))]
     public class SetAzureRmAks : CreateOrUpdateKubeBase
     {

diff --git a/src/Aks/Aks/help/New-AzAksCluster.md b/src/Aks/Aks/help/New-AzAksCluster.md
@@ -14,7 +14,7 @@ Create a new managed Kubernetes cluster.
 
 ```
 New-AzAksCluster [-Force] [-GenerateSshKey] [-NodeVmSetType <String>] [-NodeVnetSubnetID <String>]
- [-NodeMaxPodCount <Int32>] [-NodeOsType <String>] [-NodeSetPriority <String>] [-NodePoolMode <String>]
+ [-NodeMaxPodCount <Int32>] [-NodeSetPriority <String>] [-NodePoolMode <String>]
  [-NodeScaleSetEvictionPolicy <String>] [-AddOnNameToBeEnabled <String[]>] [-WorkspaceResourceId <String>]
  [-SubnetName <String>] [-AcrNameToAttach <String>] [-EnableRbac] [-WindowsProfileAdminUserName <String>]
  [-WindowsProfileAdminUserPassword <SecureString>] [-NetworkPlugin <String>] [-LoadBalancerSku <String>]
@@ -271,7 +271,7 @@ Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: azure
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -366,21 +366,6 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -NodeOsType
-OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux.
-
-```yaml
-Type: System.String
-Parameter Sets: (All)
-Aliases:
-
-Required: False
-Position: Named
-Default value: None
-Accept pipeline input: False
-Accept wildcard characters: False
-```
-
 ### -NodePoolMode
 NodePoolMode represents mode of an node pool.
 
@@ -436,7 +421,7 @@ Aliases:
 
 Required: False
 Position: Named
-Default value: None
+Default value: VirtualMachineScaleSets
 Accept pipeline input: False
 Accept wildcard characters: False
 ```
@@ -492,7 +477,7 @@ The client id and client secret associated with the AAD application / service pr
 ```yaml
 Type: System.Management.Automation.PSCredential
 Parameter Sets: (All)
-Aliases: ClientIdAndSecret
+Aliases:
 
 Required: False
 Position: 2

diff --git a/src/Aks/Aks/help/Set-AzAksCluster.md b/src/Aks/Aks/help/Set-AzAksCluster.md
@@ -331,7 +331,7 @@ The client id and client secret associated with the AAD application / service pr
 ```yaml
 Type: System.Management.Automation.PSCredential
 Parameter Sets: defaultParameterSet
-Aliases: ClientIdAndSecret
+Aliases:
 
 Required: False
 Position: 2