Skip to content

Commit 6a5f4c3

Browse files
YanaXumsJinLei
andauthored
[AKS] support EdgeZone (#20576)
Co-authored-by: Jin Lei <[email protected]>
1 parent 6b15940 commit 6a5f4c3

File tree

6 files changed

+4341
-15
lines changed

6 files changed

+4341
-15
lines changed

src/Aks/Aks.Test/ScenarioTests/KubernetesTests.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,5 +170,12 @@ public void TestEnableUptimeSLA()
170170
{
171171
TestRunner.RunTestScript("Test-EnableUptimeSLA");
172172
}
173+
174+
[Fact]
175+
[Trait(Category.AcceptanceType, Category.CheckIn)]
176+
public void TestEdgeZone()
177+
{
178+
TestRunner.RunTestScript("Test-EdgeZone");
179+
}
173180
}
174181
}

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

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -934,7 +934,6 @@ function Test-GpuInstanceProfile {
934934
}
935935
}
936936

937-
938937
function Test-EnableUptimeSLA {
939938
# Setup
940939
$resourceGroupName = Get-RandomResourceGroupName
@@ -950,7 +949,7 @@ function Test-EnableUptimeSLA {
950949
Assert-AreEqual "Basic" $cluster.Sku.Name
951950
Assert-AreEqual "Paid" $cluster.Sku.Tier
952951

953-
# create a 2nd nodepool
952+
# update the aks cluster
954953
Set-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -EnableUptimeSLA:$false
955954
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
956955
Assert-AreEqual "Basic" $cluster.Sku.Name
@@ -966,4 +965,27 @@ function Test-EnableUptimeSLA {
966965
finally {
967966
Remove-AzResourceGroup -Name $resourceGroupName -Force
968967
}
969-
}
968+
}
969+
970+
function Test-EdgeZone {
971+
# Setup
972+
$resourceGroupName = Get-RandomResourceGroupName
973+
$kubeClusterName = Get-RandomClusterName
974+
$location = 'eastus2euap'
975+
976+
try {
977+
New-AzResourceGroup -Name $resourceGroupName -Location $location
978+
979+
# create aks cluster with default nodepool
980+
New-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NodeCount 1 -EdgeZone 'microsoftrrdclab1'
981+
$cluster = Get-AzAksCluster -ResourceGroupName $resourceGroupName -Name $kubeClusterName
982+
Assert-AreEqual "microsoftrrdclab1" $cluster.ExtendedLocation.Name
983+
Assert-AreEqual "edgezone" $cluster.ExtendedLocation.Type
984+
985+
$cluster | Remove-AzAksCluster -Force
986+
}
987+
finally {
988+
Remove-AzResourceGroup -Name $resourceGroupName -Force
989+
}
990+
}
991+

0 commit comments

Comments
 (0)