Skip to content

Commit c0535c1

Browse files
wyunchi-mswyunchi-ms
authored
Update api-version to 2020-06-01. (#12883)
Co-authored-by: wyunchi-ms <[email protected]>
1 parent 1b55546 commit c0535c1

File tree

18 files changed

+2066
-7422
lines changed

18 files changed

+2066
-7422
lines changed

‎src/Aks/Aks.Test/Aks.Test.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<ItemGroup>
1414
<PackageReference Include="YamlDotNet.Signed" Version="5.2.1" />
15-
<PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.0.0" />
15+
<PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.1.0" />
1616
</ItemGroup>
1717

1818
<ItemGroup>

‎src/Aks/Aks.Test/ScenarioTests/GetAksVersionTests.ps1‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
Assert-AreEqual 8 $version.Count
66
Assert-AreEqual 0 ($version | Where-Object { $_.OrchestratorType -ne 'Kubernetes'}).Count
77

8-
$chosenVersion = $version | Where-Object { $_.OrchestratorVersion -eq '1.15.7'}
9-
Assert-AreEqual '1.15.7' $chosenVersion.OrchestratorVersion
8+
$chosenVersion = $version | Where-Object { $_.OrchestratorVersion -eq '1.15.12'}
9+
Assert-AreEqual '1.15.12' $chosenVersion.OrchestratorVersion
1010
Assert-AreEqual 2 $chosenVersion.Upgrades.Count
11-
Assert-AreEqual '1.15.10' $chosenVersion.Upgrades[0].OrchestratorVersion
11+
Assert-AreEqual '1.16.10' $chosenVersion.Upgrades[0].OrchestratorVersion
1212
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ function Test-NewAzAksSimple
88
$resourceGroupName = Get-RandomResourceGroupName
99
$kubeClusterName = Get-RandomClusterName
1010
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
11-
$nodeVmSize = "Standard_A2"
11+
$nodeVmSize = "Standard_D2_v2"
1212

1313
try
1414
{
@@ -79,8 +79,8 @@ function Test-NewAzAks
7979
$resourceGroupName = Get-RandomResourceGroupName
8080
$kubeClusterName = Get-RandomClusterName
8181
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
82-
$kubeVersion = "1.15.10"
83-
$nodeVmSize = "Standard_A2"
82+
$kubeVersion = "1.15.11"
83+
$nodeVmSize = "Standard_D2_v2"
8484
$maxPodCount = 25
8585
$nodeName = "defnode"
8686
$nodeCount = 2
@@ -95,15 +95,15 @@ function Test-NewAzAks
9595
$loadBalancerSku = "Standard"
9696
$linuxAdminUser = "linuxuser"
9797
$dnsNamePrefix = "mypre"
98-
$updatedKubeVersion = "1.15.11"
98+
$updatedKubeVersion = "1.15.12"
9999

100100
try
101101
{
102102
New-AzResourceGroup -Name $resourceGroupName -Location $location
103103

104104
if (IsLive) {
105105
$cred = $(createTestCredential "Unicorns" "Puppies")
106-
New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred -NetworkPlugin $networkPlugin `
106+
New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -NetworkPlugin $networkPlugin `
107107
-KubernetesVersion $kubeVersion -EnableRbac -LoadBalancerSku $loadBalancerSku -LinuxProfileAdminUserName $linuxAdminUser -DnsNamePrefix $dnsNamePrefix `
108108
-NodeName $nodeName -NodeOsType $nodeOsType -EnableNodeAutoScaling -NodeCount $nodeCount -NodeOsDiskSize $nodeDiskSize -NodeVmSize $nodeVmSize `
109109
-NodeMaxCount $nodeMaxCount -NodeMinCount $nodeMinCount -NodeMaxPodCount $maxPodCount -NodeSetPriority Regular -NodeScaleSetEvictionPolicy Deallocate -NodeVmSetType VirtualMachineScaleSets

‎src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ function Test-NewNodePool
55
$resourceGroupName = Get-RandomResourceGroupName
66
$kubeClusterName = Get-RandomClusterName
77
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
8-
$kubeVersion = "1.15.10"
8+
$kubeVersion = "1.15.11"
99
$nodeVmSize = "Standard_A2"
1010
$nodeVmSetType = "VirtualMachineScaleSets"
1111
$nodeOsType = "Linux"
@@ -16,7 +16,7 @@ function Test-NewNodePool
1616
$winNodeName = "windef"
1717
$winNodeOsType = "Windows"
1818

19-
$poolKubeVersion = "1.15.7"
19+
$poolKubeVersion = "1.15.11"
2020

2121
try
2222
{

‎src/Aks/Aks.Test/SessionRecords/Commands.Aks.Test.ScenarioTests.GetAksVersionTests/TestAksVersion.json‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@
77
"RequestBody": "",
88
"RequestHeaders": {
99
"x-ms-client-request-id": [
10-
"5d0e140a-7c99-4c43-9fd2-f5026ab1b111"
10+
"709eaade-063c-464c-a659-5009c09b93ad"
1111
],
1212
"Accept-Language": [
1313
"en-US"
1414
],
1515
"User-Agent": [
16-
"FxVersion/4.6.28207.03",
16+
"FxVersion/4.6.29130.01",
1717
"OSName/Windows",
18-
"OSVersion/Microsoft.Windows.10.0.18363.",
19-
"Microsoft.Azure.Management.ContainerService.ContainerServiceClient/1.0.0"
18+
"OSVersion/Microsoft.Windows.10.0.19041.",
19+
"Microsoft.Azure.Management.ContainerService.ContainerServiceClient/1.1.0"
2020
]
2121
},
2222
"ResponseHeaders": {
@@ -27,16 +27,16 @@
2727
"no-cache"
2828
],
2929
"x-ms-routing-request-id": [
30-
"SOUTHEASTASIA:20200323T150409Z:40fbb74c-652a-4dee-8144-59e9e5f65adf"
30+
"SOUTHEASTASIA:20200907T161627Z:9a32ca85-970c-446d-aea3-ecd1d35207af"
3131
],
3232
"x-ms-ratelimit-remaining-subscription-reads": [
3333
"11999"
3434
],
3535
"x-ms-correlation-request-id": [
36-
"40fbb74c-652a-4dee-8144-59e9e5f65adf"
36+
"9a32ca85-970c-446d-aea3-ecd1d35207af"
3737
],
3838
"x-ms-request-id": [
39-
"5efcec5c-7db3-44b5-83a7-370d7ebc6ee5"
39+
"1f38e52f-d8a8-456c-92b3-3c5e63b1e065"
4040
],
4141
"Strict-Transport-Security": [
4242
"max-age=31536000; includeSubDomains"
@@ -48,10 +48,10 @@
4848
"nginx"
4949
],
5050
"Date": [
51-
"Mon, 23 Mar 2020 15:04:09 GMT"
51+
"Mon, 07 Sep 2020 16:16:26 GMT"
5252
],
5353
"Content-Length": [
54-
"2599"
54+
"2924"
5555
],
5656
"Content-Type": [
5757
"application/json"
@@ -60,7 +60,7 @@
6060
"-1"
6161
]
6262
},
63-
"ResponseBody": "{\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb/providers/Microsoft.ContainerService/locations/westus/orchestrators\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.ContainerService/locations/orchestrators\",\r\n \"properties\": {\r\n \"orchestrators\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.13.11\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.13.12\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.8\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.13.12\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.8\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.7\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.8\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.10\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.14.8\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.10\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.7\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.10\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.7\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.10\",\r\n \"default\": true,\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.7\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.7\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.3\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.3\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n }\r\n}",
63+
"ResponseBody": "{\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb/providers/Microsoft.ContainerService/locations/westus/orchestrators\",\r\n \"name\": \"default\",\r\n \"type\": \"Microsoft.ContainerService/locations/orchestrators\",\r\n \"properties\": {\r\n \"orchestrators\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.11\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.12\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.10\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.13\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.15.12\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.10\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.13\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.10\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.13\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.9\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.16.13\",\r\n \"default\": true,\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.7\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.9\"\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.7\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.9\"\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.4\",\r\n \"isPreview\": true\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.6\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.17.9\",\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.4\",\r\n \"isPreview\": true\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.6\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.4\",\r\n \"isPreview\": true,\r\n \"upgrades\": [\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.6\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n },\r\n {\r\n \"orchestratorType\": \"Kubernetes\",\r\n \"orchestratorVersion\": \"1.18.6\",\r\n \"isPreview\": true\r\n }\r\n ]\r\n }\r\n}",
6464
"StatusCode": 200
6565
}
6666
],

0 commit comments

Comments
 (0)