Skip to content

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

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
FumingZhang merged 4 commits into from
Apr 7, 2022
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8c74151
keep aad profile in upgrade
FumingZhang Apr 6, 2022
a6f2086
add new version
FumingZhang Apr 6, 2022
75b914e
fix addon commands
FumingZhang Apr 7, 2022
9395a59
update history
FumingZhang Apr 7, 2022
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
12 changes: 12 additions & 0 deletions src/aks-preview/HISTORY.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,18 @@
Release History
===============

0.5.60
++++++

* BugFix: Keep aad profile in PUT request of ManagedCluster. Modified commands are
* `az aks scale`
* `az aks upgrade`
* `az aks enable-addons`
* `az aks disable-addons`
* `az aks addon enable`
* `az aks addon disable`
* `az aks addon update`

0.5.59
++++++

Expand Down
3 changes: 1 addition & 2 deletions src/aks-preview/azext_aks_preview/addonconfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,9 +270,8 @@ def update_addons(cmd, # pylint: disable=too-many-branches,too-many-statements

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
9 changes: 3 additions & 6 deletions src/aks-preview/azext_aks_preview/custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1191,9 +1191,8 @@ def aks_scale(cmd, # pylint: disable=unused-argument
"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 @@ -1282,9 +1281,8 @@ def aks_upgrade(cmd, # pylint: disable=unused-argument, too-many-return-state
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

headers = get_aks_custom_headers(aks_custom_headers)

Expand Down Expand Up @@ -2292,9 +2290,8 @@ def _update_addons(cmd, # pylint: disable=too-many-branches,too-many-statements

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
2 changes: 1 addition & 1 deletion src/aks-preview/setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from setuptools import setup, find_packages

VERSION = "0.5.59"
VERSION = "0.5.60"
CLASSIFIERS = [
"Development Status :: 4 - Beta",
"Intended Audience :: Developers",
Expand Down