[backport] v1.5 ci: [CNS] Overlay Expansion Subnet Update Job Bug Fix #4103 #4115
Conversation
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
rejain789
changed the title
Copilot finished reviewing on behalf of
rejain789
November 11, 2025 23:35
Contributor
There was a problem hiding this comment.
Pull Request Overview
This backport PR introduces subnet expansion validation logic for overlay networks in CNS (Container Network Service), specifically addressing bug fixes related to CIDR superset validation during Network Container updates. The changes allow NC primary IP updates when the new subnet is a superset of the existing subnet (e.g., expanding from /24 to /20), while still rejecting incompatible subnet changes.
Key changes:
- Added CIDR superset validation logic before rejecting primary IP changes in
CreateOrUpdateNetworkContainerInternal - Added comprehensive test coverage for both valid subnet expansions and invalid subnet changes
- Refactored existing test to use table-driven approach with multiple test cases
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 8 comments.
| File | Description |
|---|---|
| cns/restserver/internalapi.go | Adds subnet expansion validation by calling validateCIDRSuperset to check if new CIDR is a superset of existing CIDR before returning PrimaryCANotSame error |
| cns/restserver/internalapi_test.go | Refactors TestReconcileNCStatePrimaryIPChangeShouldFail to table-driven tests and adds new TestReconcileNCStatePrimaryIPChangeShouldNotFail test to validate subnet expansion scenarios |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Contributor
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
thatmattlong
approved these changes
Nov 12, 2025
Contributor
Author
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to no response for status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
thatmattlong
removed this pull request from the merge queue due to the queue being cleared
thatmattlong
removed this pull request from the merge queue due to the queue being cleared
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.
Reason for Change:
Backporting subnet overlay expansion to v1.5
Issue Fixed:
Requirements:
Notes: