update

yingnizhou · yingnizhou · commit 46d41946d442 · 2025-05-19T19:00:49.000Z
diff --git a/src/azure-cli/azure/cli/command_modules/acs/custom.py b/src/azure-cli/azure/cli/command_modules/acs/custom.py
@@ -2552,7 +2552,8 @@ def aks_agentpool_upgrade(cmd, client, resource_group_name, cluster_name,
         )
 
     # Note: we exclude this option because node image upgrade can't accept nodepool put fields like max surge
-    if (max_surge or drain_timeout or node_soak_duration or max_unavailable) and node_image_only:
+    hasUpgradeSetting = max_surge or drain_timeout or node_soak_duration or max_unavailable
+    if hasUpgradeSetting and node_image_only:
         raise MutuallyExclusiveArgumentError(
             'Conflicting flags. Unable to specify max-surge/drain-timeout/node-soak-duration/max-unavailable with node-image-only.'
             'If you want to use max-surge/drain-timeout/node-soak-duration with a node image upgrade, please first '

Original file line number	Diff line number	Diff line change
`@@ -2552,7 +2552,8 @@ def aks_agentpool_upgrade(cmd, client, resource_group_name, cluster_name,`
`2552`	`2552`	`)`
`2553`	`2553`
`2554`	`2554`	`# Note: we exclude this option because node image upgrade can't accept nodepool put fields like max surge`
`2555`		`- if (max_surge or drain_timeout or node_soak_duration or max_unavailable) and node_image_only:`
	`2555`	`+ hasUpgradeSetting = max_surge or drain_timeout or node_soak_duration or max_unavailable`
	`2556`	`+ if hasUpgradeSetting and node_image_only:`
`2556`	`2557`	`raise MutuallyExclusiveArgumentError(`
`2557`	`2558`	`'Conflicting flags. Unable to specify max-surge/drain-timeout/node-soak-duration/max-unavailable with node-image-only.'`
`2558`	`2559`	`'If you want to use max-surge/drain-timeout/node-soak-duration with a node image upgrade, please first '`