CNS Change for Subnet Overlay Expansion Job #4074
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR implements a mechanism to handle overlay subnet expansion in CNS by detecting primary IP address changes and forcing a CNS daemon restart. When a PrimaryCA mismatch is detected, the code now deletes the CNS state file and triggers a panic to restart the daemon, allowing it to pull fresh configuration from the updated NNC.
- Changes the behavior from returning an error code to panicking and deleting the state file
- Adds comprehensive test coverage for the new panic-based recovery mechanism
- Updates existing test to verify the new panic behavior instead of error return
Reviewed Changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
| cns/restserver/internalapi.go | Implements the core logic to delete state file and panic on PrimaryCA mismatch |
| cns/restserver/internalapi_test.go | Adds tests and updates existing test to verify panic behavior and state file deletion |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
|
Just got notified that this PR is replaced with the PR here: https://github.com/Azure/azure-container-networking/pull/4083/files |
rejain789
force-pushed
the
jainriya/cnsChangeForOverlayExpansion
branch
from
27f3eaa to
d452d9f
Compare
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/azp run Azure Container Networking PR |
|
Azure Pipelines successfully started running 1 pipeline(s). |
|
/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
* added logic to fix cns bug for overlay subnet expansion * reverted a line change * fixed spelling * added unit test * fixing go lint * expanded on a comment * updated logic * updated test * updated validate superset logic * updated to return bool instead of error for checking cidr superset * updated logic to check for containment --------- Co-authored-by: Riya <[email protected]> Co-authored-by: Riya <[email protected]>
5 participants
Reason for Change:
Without this CNS change, expanding an overlay subnet causes the CNS daemonset to crash, resulting in a PrimaryCANotSame error for all clusters.
To enable overlay subnet expansion:
Simply restarting CNS does not regenerate the state file with updated information. Instead, this pr will update the state file to have the new subnet address (same as the one from updated nnc) which will prevent the error only for overlay clusters when there is a mismatch of pod cidrs to start with.
Issue Fixed:
Requirements:
Notes: