Skip to content

Commit 4835054

Browse files
committed
Address comments
1 parent 12190ac commit 4835054

1 file changed

Lines changed: 3 additions & 17 deletions

File tree

src/aks-preview/azext_aks_preview/managed_cluster_decorator.py

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5235,6 +5235,9 @@ def update_agentpool_profile(self, mc: ManagedCluster) -> ManagedCluster:
52355235

52365236
# Preview-specific change: an AKS ManagedCluster of automatic
52375237
# cluster with hosted system components may not have agent pools
5238+
# When transitioning from hosted to non-hosted automatic clusters,
5239+
# customers must first add a system node pool before disabling
5240+
# the hosted system profile.
52385241
if not mc.agent_pool_profiles:
52395242
if mc.hosted_system_profile and mc.hosted_system_profile.enabled:
52405243
return mc
@@ -6578,21 +6581,6 @@ def update_upgrade_settings(self, mc: ManagedCluster) -> ManagedCluster:
65786581

65796582
return mc
65806583

6581-
def update_nodepool_taints_mc(self, mc: ManagedCluster) -> ManagedCluster:
6582-
self._ensure_mc(mc)
6583-
6584-
# update nodepool taints for all nodepools
6585-
nodepool_taints = self.context.get_nodepool_taints()
6586-
if nodepool_taints is not None:
6587-
if not mc.agent_pool_profiles:
6588-
raise UnknownError(
6589-
"Encounter an unexpected error while getting agent pool profiles from the "
6590-
"cluster in the process of updating agentpool profile."
6591-
)
6592-
for agent_profile in mc.agent_pool_profiles:
6593-
agent_profile.node_taints = nodepool_taints
6594-
return mc
6595-
65966584
def update_nodepool_initialization_taints_mc(self, mc: ManagedCluster) -> ManagedCluster:
65976585
self._ensure_mc(mc)
65986586

@@ -7299,8 +7287,6 @@ def update_mc_profile_preview(self) -> ManagedCluster:
72997287
mc = self.update_auto_upgrade_profile(mc)
73007288
# update cluster upgrade settings profile
73017289
mc = self.update_upgrade_settings(mc)
7302-
# update nodepool taints
7303-
mc = self.update_nodepool_taints_mc(mc)
73047290
# update nodepool initialization taints
73057291
mc = self.update_nodepool_initialization_taints_mc(mc)
73067292
# update acns in network_profile

0 commit comments

Comments
 (0)