Merge dev into #33928 and resolve conflicts in managed_cluster_decorator.py - #33948
Closed
Cooper Cox (coopercox-ms) with Copilot wants to merge 5 commits into
Closed
Merge dev into #33928 and resolve conflicts in managed_cluster_decorator.py#33948Cooper Cox (coopercox-ms) with Copilot wants to merge 5 commits into
Cooper Cox (coopercox-ms) with Copilot wants to merge 5 commits into
Conversation
…bnet-id to az aks update
…cluster_decorator.py Co-authored-by: coopercox-ms <264909354+coopercox-ms@users.noreply.github.com>
|
Hi Copilot, |
|
Azure Pipelines: There may be pipelines that require an authorized user to comment /azp run to run. |
microsoft-github-policy-service
Bot
requested review from
FumingZhang,
elvazhu521,
Julie Zhu (yanzhudd) and
Yong Zhang (yonzhan)
August 21, 2026 05:43
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Related command
az aks updateDescription
PR #33928 (
--enable-hosted-system,--system-node-subnet-id,--node-subnet-idonaz aks update) wentdirtyagainstdev. This merges the currentdevinto the PR branch and resolves the conflict.src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py.devaddedupdate_upstream_kubescheduler_user_configurationat the same insertion point where the PR addedupdate_hosted_system_profile, producing overlapping hunks for both the method bodies and their call sites inupdate_mc_profile_default.update_mc_profile_default: kube-scheduler config, then hosted system profile._help.py,_params.py,custom.py,linter_exclusions.yml, tests) auto-merged.Note: the merge commit lands on this branch rather than
reneeli123:reneel/hobo-migration, which is not writable from here; it needs to be pulled into the fork branch to clear the conflict on #33928.Testing Guide
azdev test acs --tests test_managed_cluster_decoratorHistory Notes
No customer-facing change; merge conflict resolution only. History note remains that of #33928.
This checklist is used to make sure that common guidelines for a pull request are followed.
The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.