Skip to content

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
devfrom
copilot/resolve-merge-conflicts
Closed

Merge dev into #33928 and resolve conflicts in managed_cluster_decorator.py#33948
Cooper Cox (coopercox-ms) with Copilot wants to merge 5 commits into
devfrom
copilot/resolve-merge-conflicts

Conversation

Copilot AI commented Aug 21, 2026

Copy link
Copy Markdown
Contributor

Related command

az aks update

Description

PR #33928 (--enable-hosted-system, --system-node-subnet-id, --node-subnet-id on az aks update) went dirty against dev. This merges the current dev into the PR branch and resolves the conflict.

  • Single conflicting file: src/azure-cli/azure/cli/command_modules/acs/managed_cluster_decorator.py. dev added update_upstream_kubescheduler_user_configuration at the same insertion point where the PR added update_hosted_system_profile, producing overlapping hunks for both the method bodies and their call sites in update_mc_profile_default.
  • Both sides kept verbatim — no behavioral edits to either feature. Ordering in update_mc_profile_default: kube-scheduler config, then hosted system profile.
  • Remaining files (_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_decorator

History 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.

reneelims and others added 5 commits August 19, 2026 15:09
…cluster_decorator.py

Co-authored-by: coopercox-ms <264909354+coopercox-ms@users.noreply.github.com>
@azure-client-tools-bot-prd

Copy link
Copy Markdown

Hi Copilot,
Since the current milestone time is less than 7 days, this pr may not catch up with this release.

@azure-pipelines

Copy link
Copy Markdown
Azure Pipelines:
There may be pipelines that require an authorized user to comment /azp run to run.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

act-observability-squad AKS az aks/acs/openshift Auto-Assign Auto assign by bot

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants