Skip to content

[Aks]Fix the issue Aks cannot be update in Automation Runbook. #15109

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

Merged
merged 2 commits into from
May 26, 2021
Merged

[Aks]Fix the issue Aks cannot be update in Automation Runbook. #15109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
debb5ca
Fix the issue Aks cannot be update in Automation Runbook.
wyunchi-ms May 26, 2021
8e528f5
Fix the issue Aks cannot be update in Automation Runbook.
wyunchi-ms May 26, 2021
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
1 change: 1 addition & 0 deletions src/Aks/Aks/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Fixed the issue that `Set-AzAks` will fail in Automation Runbook. [#15006]

## Version 2.1.0
* Added support `AcrNameToAttach` in `Set-AzAksCluster`. [#14692]
Expand Down
18 changes: 11 additions & 7 deletions src/Aks/Aks/Commands/SetAzureRmAks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,14 +289,18 @@ public override void ExecuteCmdlet()
cluster = BuildNewCluster();
}

acsServicePrincipal = EnsureServicePrincipal(ServicePrincipalIdAndSecret?.UserName, ServicePrincipalIdAndSecret?.Password?.ConvertToString());
if (this.IsParameterBound(c => c.AcrNameToAttach))
if (this.IsParameterBound(c => c.AcrNameToAttach) ||
this.IsParameterBound(c => c.AcrNameToDetach))
{
AddAcrRoleAssignment(AcrNameToAttach, nameof(AcrNameToAttach), acsServicePrincipal);
}
if (this.IsParameterBound(c => c.AcrNameToDetach))
{
RemoveAcrRoleAssignment(AcrNameToDetach, nameof(AcrNameToDetach), acsServicePrincipal);
acsServicePrincipal = EnsureServicePrincipal(ServicePrincipalIdAndSecret?.UserName, ServicePrincipalIdAndSecret?.Password?.ConvertToString());
if (this.IsParameterBound(c => c.AcrNameToAttach))
{
AddAcrRoleAssignment(AcrNameToAttach, nameof(AcrNameToAttach), acsServicePrincipal);
}
if (this.IsParameterBound(c => c.AcrNameToDetach))
{
RemoveAcrRoleAssignment(AcrNameToDetach, nameof(AcrNameToDetach), acsServicePrincipal);
}
}

var kubeCluster = Client.ManagedClusters.CreateOrUpdate(ResourceGroupName, Name, cluster);
Expand Down