[backport v1.6] [NPM Lite] Bypassing IPSets for IP CIDR Block Based Network Policies … #4147
+298
−192
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
…4107) * added logic to bypass ipsets for /32 cidrs with npm lite * removed logic to only look at /32 pod cidrs and allow all pod cidr * updated code specific to direct ip logic * fixed if else logic * added error for named port * get rid of unneeded comments * got rid of function in utils that was not neede * added unit test for translate policy * resolved pr comments * resolved copilot comments * fixed golinter
Contributor
Author
|
/azp run Azure Container Networking PR, NPM Scale Test, NPM Conformance Tests |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Copilot finished reviewing on behalf of
rejain789
November 26, 2025 19:55
Contributor
There was a problem hiding this comment.
Pull request overview
This PR implements NPM Lite mode optimization for Windows by bypassing IPSet creation for all IP CIDR-based network policies. Instead of creating IPSets for CIDR blocks, the implementation now directly embeds IP addresses in ACL policies, reducing overhead and improving performance for CIDR-based network policies when npm lite is enabled.
Key Changes:
- Added direct IP address fields (
SrcDirectIPs,DstDirectIPs) to ACL policies for npm lite mode - Implemented
directPeerAndPortAllowRulefunction to handle CIDR blocks without IPSets - Enhanced error messages for named port validation with additional context
- Refactored Windows ACL settings to support both IPSet-based and direct IP approaches
Reviewed changes
Copilot reviewed 4 out of 4 changed files in this pull request and generated 5 comments.
| File | Description |
|---|---|
| npm/pkg/dataplane/policies/policy.go | Added SrcDirectIPs and DstDirectIPs fields to ACLPolicy struct for direct IP matching; fixed comment formatting |
| npm/pkg/dataplane/policies/policy_windows.go | Implemented direct IP handling in ACL settings conversion; fixed spelling of "definitions" |
| npm/pkg/controlplane/translation/translatePolicy.go | Added directPeerAndPortAllowRule function for npm lite CIDR handling; removed npmLiteValidPolicy function; enhanced checkForNamedPortType with detailed error context |
| npm/pkg/controlplane/translation/translatePolicy_test.go | Added comprehensive tests for direct IP/CIDR handling; removed obsolete TestNpmLiteCidrPolicy; updated TestCheckForNamedPortType for new function signature |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
jpayne3506
added
npm
jpayne3506
changed the title
rayaisaiah
approved these changes
Dec 1, 2025
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 failed status checks
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.
…(#4107)
added logic to bypass ipsets for /32 cidrs with npm lite
removed logic to only look at /32 pod cidrs and allow all pod cidr
updated code specific to direct ip logic
fixed if else logic
added error for named port
get rid of unneeded comments
got rid of function in utils that was not neede
added unit test for translate policy
resolved pr comments
resolved copilot comments
fixed golinter
Reason for Change:
Issue Fixed:
Requirements:
Notes: