Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Aks] update api version to 2020-06-01 #12883

Merged
merged 1 commit into from
Sep 8, 2020
Merged

[Aks] update api version to 2020-06-01 #12883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Aks/Aks.Test/Aks.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="YamlDotNet.Signed" Version="5.2.1" />
<PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ContainerService" Version="1.1.0" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/Aks/Aks.Test/ScenarioTests/GetAksVersionTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
Assert-AreEqual 8 $version.Count
Assert-AreEqual 0 ($version | Where-Object { $_.OrchestratorType -ne 'Kubernetes'}).Count

$chosenVersion = $version | Where-Object { $_.OrchestratorVersion -eq '1.15.7'}
Assert-AreEqual '1.15.7' $chosenVersion.OrchestratorVersion
$chosenVersion = $version | Where-Object { $_.OrchestratorVersion -eq '1.15.12'}
Assert-AreEqual '1.15.12' $chosenVersion.OrchestratorVersion
Assert-AreEqual 2 $chosenVersion.Upgrades.Count
Assert-AreEqual '1.15.10' $chosenVersion.Upgrades[0].OrchestratorVersion
Assert-AreEqual '1.16.10' $chosenVersion.Upgrades[0].OrchestratorVersion
}
10 changes: 5 additions & 5 deletions src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function Test-NewAzAksSimple
$resourceGroupName = Get-RandomResourceGroupName
$kubeClusterName = Get-RandomClusterName
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
$nodeVmSize = "Standard_A2"
$nodeVmSize = "Standard_D2_v2"

try
{
Expand Down Expand Up @@ -79,8 +79,8 @@ function Test-NewAzAks
$resourceGroupName = Get-RandomResourceGroupName
$kubeClusterName = Get-RandomClusterName
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
$kubeVersion = "1.15.10"
$nodeVmSize = "Standard_A2"
$kubeVersion = "1.15.11"
$nodeVmSize = "Standard_D2_v2"
$maxPodCount = 25
$nodeName = "defnode"
$nodeCount = 2
Expand All @@ -95,15 +95,15 @@ function Test-NewAzAks
$loadBalancerSku = "Standard"
$linuxAdminUser = "linuxuser"
$dnsNamePrefix = "mypre"
$updatedKubeVersion = "1.15.11"
$updatedKubeVersion = "1.15.12"

try
{
New-AzResourceGroup -Name $resourceGroupName -Location $location

if (IsLive) {
$cred = $(createTestCredential "Unicorns" "Puppies")
New-AzAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred -NetworkPlugin $networkPlugin `
New-AzAks -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 `
-NodeMaxCount $nodeMaxCount -NodeMinCount $nodeMinCount -NodeMaxPodCount $maxPodCount -NodeSetPriority Regular -NodeScaleSetEvictionPolicy Deallocate -NodeVmSetType VirtualMachineScaleSets
Expand Down
4 changes: 2 additions & 2 deletions src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ function Test-NewNodePool
$resourceGroupName = Get-RandomResourceGroupName
$kubeClusterName = Get-RandomClusterName
$location = Get-ProviderLocation "Microsoft.ContainerService/managedClusters"
$kubeVersion = "1.15.10"
$kubeVersion = "1.15.11"
$nodeVmSize = "Standard_A2"
$nodeVmSetType = "VirtualMachineScaleSets"
$nodeOsType = "Linux"
Expand All @@ -16,7 +16,7 @@ function Test-NewNodePool
$winNodeName = "windef"
$winNodeOsType = "Windows"

$poolKubeVersion = "1.15.7"
$poolKubeVersion = "1.15.11"

try
{
Expand Down
20 changes: 10 additions & 10 deletions ...est/SessionRecords/Commands.Aks.Test.ScenarioTests.GetAksVersionTests/TestAksVersion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"RequestBody": "",
"RequestHeaders": {
"x-ms-client-request-id": [
"5d0e140a-7c99-4c43-9fd2-f5026ab1b111"
"709eaade-063c-464c-a659-5009c09b93ad"
],
"Accept-Language": [
"en-US"
],
"User-Agent": [
"FxVersion/4.6.28207.03",
"FxVersion/4.6.29130.01",
"OSName/Windows",
"OSVersion/Microsoft.Windows.10.0.18363.",
"Microsoft.Azure.Management.ContainerService.ContainerServiceClient/1.0.0"
"OSVersion/Microsoft.Windows.10.0.19041.",
"Microsoft.Azure.Management.ContainerService.ContainerServiceClient/1.1.0"
]
},
"ResponseHeaders": {
Expand All @@ -27,16 +27,16 @@
"no-cache"
],
"x-ms-routing-request-id": [
"SOUTHEASTASIA:20200323T150409Z:40fbb74c-652a-4dee-8144-59e9e5f65adf"
"SOUTHEASTASIA:20200907T161627Z:9a32ca85-970c-446d-aea3-ecd1d35207af"
],
"x-ms-ratelimit-remaining-subscription-reads": [
"11999"
],
"x-ms-correlation-request-id": [
"40fbb74c-652a-4dee-8144-59e9e5f65adf"
"9a32ca85-970c-446d-aea3-ecd1d35207af"
],
"x-ms-request-id": [
"5efcec5c-7db3-44b5-83a7-370d7ebc6ee5"
"1f38e52f-d8a8-456c-92b3-3c5e63b1e065"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
Expand All @@ -48,10 +48,10 @@
"nginx"
],
"Date": [
"Mon, 23 Mar 2020 15:04:09 GMT"
"Mon, 07 Sep 2020 16:16:26 GMT"
],
"Content-Length": [
"2599"
"2924"
],
"Content-Type": [
"application/json"
Expand All @@ -60,7 +60,7 @@
"-1"
]
},
"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}",
"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}",
"StatusCode": 200
}
],
Expand Down
Loading