Skip to content

[Storage] Merge latest change from master to storage preview branch #12952

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.

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

Merged
merged 97 commits into from
Sep 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
8e9d5f4
Ignore API version in Network tests (#12217)
anton-evseev Jun 22, 2020
7479c2b
Network tests: change RunType to AcceptanceType for LiveOnly tests (#…
anton-evseev Jun 22, 2020
e4edf11
[Network] Add Cmdlets for Network Virtual Appliance (NVA) and NVA si…
3vilbuff3r Jun 22, 2020
a1473c1
Onboard application gateway to PrivateLink Cmdlets (#12223)
jaishals Jun 22, 2020
d604afe
Merge remote-tracking branch 'remotes/upstream/master' into merge-fro…
anton-evseev Jun 22, 2020
976635f
Merge remote-tracking branch 'remotes/upstream/master' into merge-fro…
anton-evseev Jun 29, 2020
80e1ea3
Merge pull request #12235 from number213/merge-from-master
VeryEarly Jun 30, 2020
fb16075
Update recording mocking in HPCCache.Test.csproj (#12294)
anton-evseev Jun 30, 2020
5d8291a
Update Network owners (#12305)
anton-evseev Jul 2, 2020
6cecf64
Add RemoteBgpCommunities property to the VirtualNetworkPeering resour…
jarango Jul 13, 2020
3aa7d78
Add the new switch parameter AllowActiveFTP to Firewall Command (#12430)
tejasshah7 Jul 19, 2020
13eab56
Add HubIpConfiguration and HubBgpConnections (#12565)
litchiyangMSFT Aug 6, 2020
5d830ac
Change test name of virtual router peer (#12711)
litchiyangMSFT Aug 20, 2020
2f1b6b2
Fixed build version (#12750)
MikhailTryakhov Aug 24, 2020
4416b0e
Merge branch 'master' into network-june
MikhailTryakhov Aug 24, 2020
2db6556
Fixed az nw sdk version (#12763)
MikhailTryakhov Aug 25, 2020
891996d
Enable internet security feature for VirtualWan P2SVpnGateway client …
Nilambari Aug 28, 2020
65e7a43
Vmss dedicated host (#12588)
haagha Aug 28, 2020
72533af
Fix Typo in 'Remove-cmdlet-example.md' (#12774)
BethanyZhou Aug 28, 2020
ee0497e
[KeyVault] Doc update about SAN certificate (#12785)
isra-fel Aug 28, 2020
9118cbe
Patch for release 2020 08 25 (#12795)
haagha Aug 28, 2020
6e070dc
Add isolated trust model example to the documentation for the Reset_A…
gkostal Aug 28, 2020
20a5aee
[Resources] Bug fixes for deployment and deployment What-If cmdlets (…
shenglol Aug 28, 2020
61d1aaa
Ignore PrivateDns module each time it upgrades (#12798)
Y-Sindo Aug 28, 2020
c83a521
release-2020-08-28 (#12801)
dingmeng-xue Aug 28, 2020
cc86dd2
release-2020-08-28
dingmeng-xue Aug 28, 2020
d747cc0
[Network] Add Cmdlets for BYOIP Feature (#12704)
dexiang-ms Aug 28, 2020
5ed292c
[Compute] Vm health field in vm instance view (#12693)
madewithsmiles Aug 31, 2020
63b4ff6
[Resources] Fix array parameter serialization issue (#12805)
shenglol Aug 31, 2020
8f1abc1
Update New-AzResourceLock.md examples (#12225) (#12806)
time-by-waves Aug 31, 2020
7bf263d
New packet capture Cmdlet for Network Module: VpnConnection and VpnGa…
jiaczh Aug 31, 2020
6ded162
Add new examples to DataLakeStore (#12793)
aladdindoc Aug 31, 2020
b4ac9f5
Expose IP Configurations for Microsoft.Network\VpnGateways (#12315)
Sep 1, 2020
844ed23
Any Source to Local IP range (#12812)
tobystic Sep 1, 2020
e3c1759
add test case for AzPowerShellSetup (#12635)
liubing-microsoft Sep 1, 2020
440b4eb
[Storage] Support Point in Time Restore (#12799)
blueww Sep 1, 2020
4e60cdb
[RecoveryServices.Backup] Adding data source move feature - Copy-AzRe…
hiaga Sep 2, 2020
712fd6d
appgw: validate cert only if certificateFile is specified in set ssl …
akshaysngupta Sep 2, 2020
eecc6f9
Adding new optional parameter BackupStorageRedundancy to New-AzSqlIns…
petrajkogit Sep 2, 2020
00bc26d
Format BreakingChange Output Messages (#12740)
BethanyZhou Sep 2, 2020
87ff4f8
Remote/network june fix (#12839)
MikhailTryakhov Sep 2, 2020
52e89b4
Merge branch 'master' into network-june
MikhailTryakhov Sep 2, 2020
88a7820
Add null check in ConditionVersion of Set-AzRoleAssignmenr (#12829)
dagoroz Sep 3, 2020
8639a13
Added operation parameters and operation steps in MI operations PS cm…
toki95 Sep 3, 2020
17cd174
Adding patchStatus property to VM Instance View (#12777)
haagha Sep 3, 2020
6546bb6
Corrected parameter field name in the example (#12825)
Sep 3, 2020
9b2d78c
Update spelling of Proeprty to Property (#12821)
time-by-waves Sep 3, 2020
b4bea1f
[SQL] Fix\add AzSqlServerActiveDirectoryOnlyAuthentication APIs (#12782)
amolagar5 Sep 3, 2020
260f054
[RecoveryServices.backup] changing number of VMs from 100 to 1000 (#1…
hiaga Sep 3, 2020
b964fcd
[KeyVault] Refactor tests (#12797)
isra-fel Sep 3, 2020
e2f6357
Add parameter EnableRbcAuthorization for 'New-AzKeyVault' and 'Update…
BethanyZhou Sep 3, 2020
6a8b914
Disk Access changes (#12673)
haagha Sep 4, 2020
c1de68b
Remote/network june fix (#12853)
MikhailTryakhov Sep 4, 2020
a8239d0
Skip network api version check (#12854)
aim-for-better Sep 4, 2020
2559453
Remote/network june fix (#12855)
MikhailTryakhov Sep 4, 2020
d7333ce
[Synapse] Add dataset and data flow management cmdlets and update som…
wonner Sep 4, 2020
7806ebd
RecoveryServices oob release (#12845)
dingmeng-xue Sep 4, 2020
728aaab
Fix network june (#12868)
MikhailTryakhov Sep 4, 2020
2e20a16
Update Add-AzApplicationGatewayCustomError.md (#12784)
hagop-esfahani Sep 7, 2020
debfb78
New Az Cmdlets for Service fabric Managed Clusters and Node Types (#1…
a-santamaria Sep 8, 2020
bbd46f0
Adding Warning message for 3 regions when Geo backup storage redundan…
petrajkogit Sep 8, 2020
791752a
Merge branch 'master' into network-june
MikhailTryakhov Sep 8, 2020
7d05ac3
Updated Set-AzVirtualNetworkSubnetConfig to allow NSG and Route Table…
CloudPlatformer Sep 8, 2020
90700ce
Merge branch 'master' into network-june
MikhailTryakhov Sep 8, 2020
1a2b64f
[Storage] Upgrade DMlib to fix issue #12220 (#12882)
blueww Sep 8, 2020
1b55546
[CosmosDB] Migration support for throughput (#12814)
MehaKaushik Sep 8, 2020
c0535c1
Update api-version to 2020-06-01. (#12883)
wyunchi-ms Sep 8, 2020
297d4f4
Merge branch 'master' into network-june
dingmeng-xue Sep 8, 2020
60f21f3
Merge pull request #12751 from Azure/network-june
dingmeng-xue Sep 8, 2020
fbe8485
breaking change flag. (#12892)
Sandido Sep 9, 2020
bcb4946
Initial version of resource mover (#12876)
dolauli Sep 9, 2020
288c804
update help for AAS Skus (#12895)
pychuang Sep 9, 2020
afc92fb
Adding support for Premium V3 tier (#12869)
vinisoto Sep 9, 2020
58eb5d5
update Azure Web App runtime stack to DOTNETCORE (#12833)
inmishrar Sep 9, 2020
6712ed2
Get-AzResourceGroup - New example, and cleanup (#12828)
roberthstrand Sep 9, 2020
fad8443
[SQL] Add Managed Database Log Replay service cmdlets (#12800)
milanbrkic-ms Sep 9, 2020
4a4733c
Fix SecureString issue on linux (#12861)
dolauli Sep 9, 2020
20c05f0
[Aks]Add new switch GenerateSshKey to generate SSH keys if necessary …
wyunchi-ms Sep 9, 2020
7af183d
Fix Network ChangeLog merging error (#12901)
msJinLei Sep 9, 2020
1b9a021
[Storage] Added breaking change warning message for upcoming cmdlet o…
msJinLei Sep 10, 2020
879da76
[NetAppFiles]Added Revert cmdlet, update to 2020-02-01 apiversion (#1…
audunn Sep 10, 2020
307871b
Powershell for AAD Only Authentication on Managed Instance. (#12890)
strehan1993 Sep 10, 2020
204ffc7
Add new examples to AnalysisServices (#12909)
aladdindoc Sep 10, 2020
344a3ee
Fixing Delete State for workload backup items (#12918)
hiaga Sep 10, 2020
51bb40a
Update Remove-AzNetworkInterfaceIpConfig.md (#12807)
Lochiluk Sep 10, 2020
4da0179
Fix for Set-AzSqlManagedInstance to not set Geo be default (#12921)
petrajkogit Sep 11, 2020
2012dd9
Add Dockerfile-alpine-3.10 (#12911)
ThomVanL Sep 11, 2020
865af59
[HDInsight] Support HDI Autoscale Feature (#12858)
aim-for-better Sep 11, 2020
44e5777
[Network] Add New-AzExpressRoutePortLOA cmdlet (#12465)
3vilbuff3r Sep 11, 2020
56dbaa9
Update AzSql for new features in SDK 1.44.2-preview (#12899)
brandong-ms Sep 11, 2020
c27f3d3
[Functions / ConnectedMachine] Move generated code. (#12915)
LucasYao93 Sep 11, 2020
c27f45a
Add client side parameter validation logic. (#12905)
wyunchi-ms Sep 11, 2020
b497ed6
update sdk version (#12931)
sakash279 Sep 11, 2020
35506b5
Fix the invaild link of cmdlet in md file. (#12916)
LucasYao93 Sep 11, 2020
8dd2243
Polish changelog for upcoming release (#12938)
dingmeng-xue Sep 11, 2020
ea3859e
fix merge conflicts
blueww Sep 14, 2020
6c41d8d
Fix CI failure
blueww Sep 15, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# To make sure Network PRs go to the right branch, e.g. network-april
/src/Network/ @number213

/src/Network/ @MikhailTryakhov
/src/Compute/ @bilaakpan-ms @sandido @dkulkarni-ms @haagha @madewithsmiles @MS-syh2qs @grizzlytheodore
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 4.6.1 - August 2020
#### Az.Compute
* Patched '-EncryptionAtHost' parameter in 'New-AzVm' to remove default value of false [#12776]

## 4.6.0 - August 2020
#### Az.Accounts
* Loaded all public cloud environments when discovery endpoint doesn't return default AzureCloud or other public environments [#12633]
Expand Down
40 changes: 40 additions & 0 deletions docker/Dockerfile-alpine-3.10
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
FROM mcr.microsoft.com/powershell:alpine-3.10

ARG REPOSITORY=PSGallery
ARG MODULE=Az
ARG CONFIG=config
ARG AZURERM_CONTEXT_SETTINGS=AzureRmContextSettings.json
ARG AZURE=/root/.Azure
ARG VCS_REF="none"
ARG BUILD_DATE=
ARG VERSION=
ARG IMAGE_NAME=mcr.microsoft.com/azure-powershell:${VERSION}-alpine-3.10

ENV AZUREPS_HOST_ENVIRONMENT="dockerImage/${VERSION}-alpine-3.10"

LABEL maintainer="Azure PowerShell Team <[email protected]>" \
readme.md="http://aka.ms/azpsdockerreadme" \
description="This Dockerfile will install the latest release of Azure PowerShell." \
org.label-schema.build-date=${BUILD_DATE} \
org.label-schema.usage="http://aka.ms/azpsdocker" \
org.label-schema.url="http://aka.ms/azpsdockerreadme" \
org.label-schema.vcs-url="https://github.com/Azure/azure-powershell" \
org.label-schema.name="azure powershell" \
org.label-schema.vendor="Azure PowerShell" \
org.label-schema.version=${VERSION} \
org.label-schema.schema-version="1.0" \
org.label-schema.vcs-ref=${VCS_REF} \
org.label-schema.docker.cmd="docker run --rm ${IMAGE_NAME} pwsh -c '\$PSVERSIONTABLE'" \
org.label-schema.docker.cmd.devel="docker run -it --rm -e 'DebugPreference=Continue' ${IMAGE_NAME} pwsh" \
org.label-schema.docker.cmd.test="currently not available" \
org.label-schema.docker.cmd.help="docker run --rm ${IMAGE_NAME} pwsh -c Get-Help"

# install azure-powershell from PSGallery
RUN pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Trusted && \
pwsh -Command Install-Module -Name ${MODULE} -RequiredVersion ${VERSION} -Repository ${REPOSITORY} && \
pwsh -Command Set-PSRepository -Name ${REPOSITORY} -InstallationPolicy Untrusted

# create AzureRmContextSettings.json before it was generated
COPY ${CONFIG}/${AZURERM_CONTEXT_SETTINGS} ${AZURE}/${AZURERM_CONTEXT_SETTINGS}

CMD [ "pwsh" ]
6 changes: 6 additions & 0 deletions documentation/azure-powershell-modules.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ Content Delivery Network | `Az.Cdn`
Cognitive Services | `Az.CognitiveServices` | [![CognitiveServices]][CognitiveServicesGallery]
Compute | `Az.Compute` | [![Compute]][ComputeGallery]
Connected Kubernetes | `Az.ConnectedKubernetes` | [![ConnectedKubernetes]][ConnectedKubernetesGallery]
Connected Machine | `Az.ConnectedMachine` | [![ConnectedMachine]][ConnectedMachineGallery]
Container Instance | `Az.ContainerInstance` | [![ContainerInstance]][ContainerInstanceGallery]
Container Registry | `Az.ContainerRegistry` | [![ContainerRegistry]][ContainerRegistryGallery]
Cosmos DB | `Az.CosmosDB` | [![CosmosDB]][CosmosDBGallery]
Expand Down Expand Up @@ -92,6 +93,7 @@ Redis Cache | `Az.RedisCache`
Relay | `Az.Relay` | [![Relay]][RelayGallery]
Reservations | `Az.Reservations` | [![Reservations]][ReservationsGallery]
Resource Graph | `Az.ResourceGraph` | [![ResourceGraph]][ResourceGraphGallery]
Resource Mover | `Az.ResourceMover` | [![ResourceMover]][ResourceMoverGallery]
Resources | `Az.Resources` | [![Resources]][ResourcesGallery]
Search | `Az.Search` | [![Search]][SearchGallery]
Security | `Az.Security` | [![Security]][SecurityGallery]
Expand Down Expand Up @@ -135,6 +137,7 @@ Web App Service | `Az.Websites`
[CognitiveServices]: https://img.shields.io/powershellgallery/v/Az.CognitiveServices.svg?style=flat-square&label=Az.CognitiveServices
[Compute]: https://img.shields.io/powershellgallery/v/Az.Compute.svg?style=flat-square&label=Az.Compute
[ConnectedKubernetes]: https://img.shields.io/powershellgallery/v/Az.ConnectedKubernetes.svg?style=flat-square&label=Az.ConnectedKubernetes
[ConnectedMachine]: https://img.shields.io/powershellgallery/v/Az.ConnectedMachine.svg?style=flat-square&label=Az.ConnectedMachine
[ContainerInstance]: https://img.shields.io/powershellgallery/v/Az.ContainerInstance.svg?style=flat-square&label=Az.ContainerInstance
[ContainerRegistry]: https://img.shields.io/powershellgallery/v/Az.ContainerRegistry.svg?style=flat-square&label=Az.ContainerRegistry
[CosmosDB]: https://img.shields.io/powershellgallery/v/Az.CosmosDB.svg?style=flat-square&label=Az.CosmosDB
Expand Down Expand Up @@ -199,6 +202,7 @@ Web App Service | `Az.Websites`
[Relay]: https://img.shields.io/powershellgallery/v/Az.Relay.svg?style=flat-square&label=Az.Relay
[Reservations]: https://img.shields.io/powershellgallery/v/Az.Reservations.svg?style=flat-square&label=Az.Reservations
[ResourceGraph]: https://img.shields.io/powershellgallery/v/Az.ResourceGraph.svg?style=flat-square&label=Az.ResourceGraph
[ResourceMover]: https://img.shields.io/powershellgallery/v/Az.ResourceMover.svg?style=flat-square&label=Az.ResourceMover
[Resources]: https://img.shields.io/powershellgallery/v/Az.Resources.svg?style=flat-square&label=Az.Resources
[Search]: https://img.shields.io/powershellgallery/v/Az.Search.svg?style=flat-square&label=Az.Search
[Security]: https://img.shields.io/powershellgallery/v/Az.Security.svg?style=flat-square&label=Az.Security
Expand Down Expand Up @@ -240,6 +244,7 @@ Web App Service | `Az.Websites`
[CognitiveServicesGallery]: https://www.powershellgallery.com/packages/Az.CognitiveServices/
[ComputeGallery]: https://www.powershellgallery.com/packages/Az.Compute/
[ConnectedKubernetesGallery]: https://www.powershellgallery.com/packages/Az.ConnectedKubernetes/
[ConnectedMachine]: https://www.powershellgallery.com/packages/Az.ConnectedMachine/
[ContainerInstanceGallery]: https://www.powershellgallery.com/packages/Az.ContainerInstance/
[ContainerRegistryGallery]: https://www.powershellgallery.com/packages/Az.ContainerRegistry/
[CosmosDBGallery]: https://www.powershellgallery.com/packages/Az.CosmosDB/
Expand Down Expand Up @@ -304,6 +309,7 @@ Web App Service | `Az.Websites`
[RelayGallery]: https://www.powershellgallery.com/packages/Az.Relay/
[ReservationsGallery]: https://www.powershellgallery.com/packages/Az.Reservations/
[ResourceGraphGallery]: https://www.powershellgallery.com/packages/Az.ResourceGraph/
[ResourceMoverGallery]: https://www.powershellgallery.com/packages/Az.ResourceMover/
[ResourcesGallery]: https://www.powershellgallery.com/packages/Az.Resources/
[SearchGallery]: https://www.powershellgallery.com/packages/Az.Search/
[SecurityGallery]: https://www.powershellgallery.com/packages/Az.Security/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ namespace Microsoft.Azure.Commands.Service
if (this.ShouldProcess(this.Name, string.Format("Deleting ChildResource '{0}' in resource group '{1}' under parent TopLevelResource '{2}'.", this.Name, this.ResourceGroupName, this.TopLevelResourceName)))
{
this.MySDKClient.ChildResource.Delete(this.ResourceGroupName, this.TopLevelResourceName, this.Name);
if (this.IsPassThru.IsPresent)
if (this.PassThru.IsPresent)
{
WriteObject(true);
}
Expand Down
1 change: 1 addition & 0 deletions src/Accounts/Accounts/ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Formatted the upcoming breaking change messages
* Updated Azure.Core to 1.4.1

## Version 1.9.3
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ public static bool HasProperty(this PSObject source, string name)
/// </summary>
/// <typeparam name="T">The type of the property to look for</typeparam>
/// <param name="source">The PSObject to check</param>
/// <param name="name">The name of the proeprty to look for</param>
/// <param name="name">The name of the property to look for</param>
/// <returns>true if the PSObject has a property with the given name, otherwise false</returns>
public static bool HasProperty<T>(this PSObject source, string name)
{
Expand Down Expand Up @@ -211,7 +211,7 @@ public static void Populate(this IDictionary<string, string> dictionary, string
/// Populate a list from a proprty of the given PSObject
/// </summary>
/// <param name="list">The list to populate</param>
/// <param name="name">The name of the proeprty contiaing the list</param>
/// <param name="name">The name of the property contiaing the list</param>
/// <param name="other">The PSObject to populate the list from</param>
public static void Populate(this IList<string> list, string name, PSObject other)
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/Accounts/Authentication.Test/PSSerializationTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,8 @@ IAzureContext GetDefaultContext()
VersionProfile = "2017_09_25"
};

context.SetProperty("ContextProeprty1", "ContextProperty1Value1", "ContextProperty1Value2");
context.SetProperty("ContextProeprty2", "ContextProperty2Value1", "ContextProperty2Value2");
context.SetProperty("ContextProperty1", "ContextProperty1Value1", "ContextProperty1Value2");
context.SetProperty("ContextProperty2", "ContextProperty2Value1", "ContextProperty2Value2");

return context;
}
Expand Down
4 changes: 2 additions & 2 deletions src/Accounts/Authentication/Properties/Resources.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src/Aks/Aks.Test/Aks.Test.csproj
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
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
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
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
Loading