Skip to content

{AKS} Keep aad profile in PUT request of ManagedCluster #21973

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
zhoxing-ms merged 1 commit into from
Apr 12, 2022
Merged

{AKS} Keep aad profile in PUT request of ManagedCluster #21973

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
9 changes: 3 additions & 6 deletions src/azure-cli/azure/cli/command_modules/acs/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2299,9 +2299,8 @@ def aks_scale(cmd, client, resource_group_name, name, node_count, nodepool_name=
"Cannot scale cluster autoscaler enabled node pool.")

agent_profile.count = int(node_count) # pylint: disable=no-member
# null out the SP and AAD profile because otherwise validation complains
# null out the SP profile because otherwise validation complains
instance.service_principal_profile = None
instance.aad_profile = None
return sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, name, instance)
raise CLIError('The nodepool "{}" was not found.'.format(nodepool_name))

Expand Down Expand Up @@ -2453,9 +2452,8 @@ def aks_upgrade(cmd,
agent_profile.orchestrator_version = kubernetes_version
agent_profile.creation_data = None

# null out the SP and AAD profile because otherwise validation complains
# null out the SP profile because otherwise validation complains
instance.service_principal_profile = None
instance.aad_profile = None

return sdk_no_wait(no_wait, client.begin_create_or_update, resource_group_name, name, instance)

Expand Down Expand Up @@ -2790,9 +2788,8 @@ def _update_addons(cmd, instance, subscription_id, resource_group_name, name, ad

instance.addon_profiles = addon_profiles

# null out the SP and AAD profile because otherwise validation complains
# null out the SP profile because otherwise validation complains
instance.service_principal_profile = None
instance.aad_profile = None

return instance

Expand Down