Update api-version to 2020-06-01.

Azure · Sep 8, 2020 · 3ebbd59 · 3ebbd59
1 parent 7d05ac3
commit 3ebbd59
Show file tree

Hide file tree

Showing 18 changed files with 2,066 additions and 7,422 deletions.
diff --git a/src/Aks/Aks.Test/Aks.Test.csproj b/src/Aks/Aks.Test/Aks.Test.csproj
@@ -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>

diff --git a/src/Aks/Aks.Test/ScenarioTests/GetAksVersionTests.ps1 b/src/Aks/Aks.Test/ScenarioTests/GetAksVersionTests.ps1
@@ -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
 }
diff --git a/src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1 b/src/Aks/Aks.Test/ScenarioTests/KubernetesTests.ps1
@@ -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
     {
@@ -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
@@ -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

diff --git a/src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1 b/src/Aks/Aks.Test/ScenarioTests/NodePoolTests.ps1
@@ -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"
@@ -16,7 +16,7 @@ function Test-NewNodePool
     $winNodeName = "windef"
     $winNodeOsType = "Windows"
 
-    $poolKubeVersion = "1.15.7"
+    $poolKubeVersion = "1.15.11"
 
     try
     {

diff --git a/...est/SessionRecords/Commands.Aks.Test.ScenarioTests.GetAksVersionTests/TestAksVersion.json b/...est/SessionRecords/Commands.Aks.Test.ScenarioTests.GetAksVersionTests/TestAksVersion.json
@@ -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": {
@@ -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"
@@ -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"
@@ -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
     }
   ],