Skip to content

Commit b660b63

Browse files
authored
[AKS] Fixed the issue of '-DisableLocalAccount' for 'Set-AzAksCluster' (#21869)
* [AKS] support parameter OutboundType * [AKS] Fixed the issue of Enable-AzAksAddon when there are no addons * [AKS] Fixed the issue of '-DisableLocalAccount' for 'Set-AzAksCluster'
1 parent 45fbfd0 commit b660b63

File tree

4 files changed

+1282
-709
lines changed

4 files changed

+1282
-709
lines changed

src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ function Test-AadProfile {
10451045
#New-AzADGroup -DisplayName $AdGroupName -MailNickname $AdGroupName
10461046
#$adGroup = Get-AzADGroup -DisplayName $AdGroupName
10471047
#$adGroupId = $adGroup.Id
1048-
$adGroupId = 'e74a0087-33b6-4144-977d-f9802b0031d4'
1048+
$adGroupId = '1e1dad09-f44e-4ec3-9bdd-6c92d2099c63'
10491049
$AadProfile=@{
10501050
managed=$true
10511051
enableAzureRBAC=$false
@@ -1054,18 +1054,22 @@ function Test-AadProfile {
10541054
$AadProfile=[Microsoft.Azure.Management.ContainerService.Models.ManagedClusterAADProfile]$AadProfile
10551055

10561056
# create aks cluster with AadProfile
1057-
New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeCount 1 -AadProfile $AadProfile
1057+
New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeCount 1 -AadProfile $AadProfile -DisableLocalAccount
10581058
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
10591059
Assert-ObjectEquals $AadProfile.managed $cluster.AadProfile.managed
10601060
Assert-ObjectEquals $AadProfile.enableAzureRBAC $cluster.AadProfile.enableAzureRBAC
10611061
Assert-ObjectEquals $AadProfile.adminGroupObjectIDs $cluster.AadProfile.adminGroupObjectIDs
10621062
Assert-ObjectEquals '54826b22-38d6-4fb2-bad9-b7b93a3e9c5a' $cluster.AadProfile.TenantID
1063+
Assert-ObjectEquals $true $cluster.DisableLocalAccounts
1064+
$cluster = $cluster | Set-AzAksCluster -DisableLocalAccount:$false
1065+
Assert-ObjectEquals $false $cluster.DisableLocalAccounts
10631066
$cluster | Remove-AzAksCluster -Force
10641067

10651068
# create aks cluster without AadProfile
10661069
New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeCount 1
10671070
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
10681071
Assert-Null $cluster.AadProfile
1072+
Assert-Null $cluster.DisableLocalAccounts
10691073
# update the aks cluster with AadProfile
10701074
Set-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -AadProfile $AadProfile
10711075
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
@@ -1074,6 +1078,9 @@ function Test-AadProfile {
10741078
Assert-ObjectEquals "" $cluster.AadProfile.enableAzureRBAC
10751079
Assert-ObjectEquals $AadProfile.adminGroupObjectIDs $cluster.AadProfile.adminGroupObjectIDs
10761080
Assert-ObjectEquals '54826b22-38d6-4fb2-bad9-b7b93a3e9c5a' $cluster.AadProfile.TenantID
1081+
Assert-Null $cluster.DisableLocalAccounts
1082+
$cluster = $cluster | Set-AzAksCluster -DisableLocalAccount
1083+
Assert-ObjectEquals $true $cluster.DisableLocalAccounts
10771084
$cluster | Remove-AzAksCluster -Force
10781085
}
10791086
finally {

0 commit comments

Comments
 (0)