Prefix on nicv6 support #3658

NihaNallappagari · 2025-05-13T22:54:15Z

Reason for Change:
Current Problem:
VNET currently limits scaling to 64K IP addresses per VNET due to per-IP route mappings. To support larger AKS clusters, the platform is introducing per-prefix (CIDR) route mapping, allowing a single mapping to represent multiple IPs (e.g., /24 enables 256 IPs per mapping). This enables scaling up to 16 million IPs per VNET without impacting the underlying platform.

Change needed:
Prefix on NIC v4 is supported in Swiftv1, but Swiftv1 does not support IPv6. This change upgrades Prefix on NIC v4 functionality to Swiftv2 and introduces IPv6 support in Swiftv2.

Changes
This PR has changes specific to Prefix on NICv6
CNS
--Consuming PrimaryIPv6, GatewayIPv6, MacAddress (DelegatedNIC) from NNC CRD because of dualstack NC
--IP allocation: Assign IPs of each IPFamily as part of RequestIPs api request (Currently when a pod is created, IPAM RequestsIPs from CNS where CNS picks one IP from each NC and hands it over to IPAM.

IPAM
--Change RequestIPs response parsing to read GatewayIPv6 and MacAddress
--Populates Interfaces with MacAddress which is used by CNI to plumb routes to send traffic

Design doc for pocv6 with sample NNC
Requirements:

uses conventional commit messages
includes documentation
adds unit tests
relevant PR labels added

Notes:

NihaNallappagari · 2025-05-13T23:45:20Z

@microsoft-github-policy-service agree company="Microsoft"

azure-ipam/ipam.go

azure-ipam/ipconfig/ipconfig.go

cns/kubecontroller/nodenetworkconfig/conversion_linux.go

cns/restserver/internalapi.go

cns/restserver/internalapi_linux.go

tamilmani1989 · 2025-06-05T23:26:20Z

@rbtr can you review this as well since it touches cns changes for aks swift too

Copilot

Pull Request Overview

This PR introduces changes to support dual-stack NIC functionality for Prefix on NICv6 scenarios by extending both CNS and IPAM components. Key updates include:

CNS: Populating the MACAddress in podIPInfo and skipping NC version sync when a MAC address is present.
IPAM: Adjusting IP allocation logic by mapping and handling multiple IP families and updating error messages accordingly.
Additional updates in tests, internal API, conversion, network container contract, and Azure IPAM integration to support IPv6 gateway addresses and related deduplication.

Reviewed Changes

Copilot reviewed 10 out of 10 changed files in this pull request and generated no comments.

Show a summary per file

File	Description
cns/restserver/util.go	Added MACAddress population to podIPInfo
cns/restserver/ipam.go	Adjusted IP assignment logic for dual-stack handling and introduced generateAssignedIPKey
cns/restserver/internalapi_test.go	Added test to verify skipping NC version sync for prefix on NIC swift v2
cns/restserver/internalapi_linux.go	Added IPv4 check in SNAT rule programming
cns/restserver/internalapi.go	Skips sync for prefix on NIC when MAC address is set
cns/kubecontroller/nodenetworkconfig/conversion_linux.go	Updated static NC request conversion to handle single IP prefix cases properly
cns/NetworkContainerContract.go	Added IPv6 gateway field and IPFamily enum definition
azure-ipam/ipconfig/ipconfig.go	Updated response processing to include IPv6 gateway parsing
azure-ipam/ipam.go	Modified CmdAdd to integrate IPv6 gateway assignment and deduplicate interfaces

Comments suppressed due to low confidence (2)

cns/restserver/ipam.go:1029

Consider adding an inline comment to clarify why the slice size for podIPInfo is set to the number of IP families, emphasizing how dual-stack handling determines the number of IPs to assign.

numberOfIPs = numOfIPFamilies

azure-ipam/ipam.go:150

[nitpick] Consider adding a comment explaining that the deduplication of interfaces by MAC address is deliberate to avoid duplicate interface entries when multiple IP family entries point to the same network interface.

if podIPInfo.MacAddress == "" || seenInterfaces[podIPInfo.MacAddress] {

rbtr

are there AzCNI changes I'm missing here or is this only for Cilium?

azure-ipam/ipconfig/ipconfig.go

cns/restserver/internalapi.go

cns/restserver/internalapi_linux.go

cns/restserver/internalapi_test.go

cns/restserver/ipam.go

azure-ipam/ipconfig/ipconfig.go

cns/restserver/internalapi_linux.go

azure-ipam/ipam.go

cns/restserver/ipam.go

cns/restserver/internalapi.go

NihaNallappagari · 2025-06-30T20:46:48Z

are there AzCNI changes I'm missing here or is this only for Cilium?

The changes are related to only Cilium, no azure cni changes made

azure-ipam/ipam_test.go

cns/restserver/ipam.go

cns/kubecontroller/nodenetworkconfig/conversion_linux.go

cns/kubecontroller/nodenetworkconfig/reconciler.go

cns/restserver/ipam.go

cns/service/main.go

cns/NetworkContainerContract.go

cns/restserver/ipam.go

github-actions · 2025-09-04T00:01:48Z

This pull request is stale because it has been open for 2 weeks with no activity. Remove stale label or comment or this will be closed in 7 days

NihaNallappagari · 2025-09-17T19:17:38Z

/azp run Azure Container Networking PR

azure-pipelines · 2025-09-17T19:17:50Z

Azure Pipelines successfully started running 1 pipeline(s).

NihaNallappagari · 2025-09-18T13:30:27Z

/azp run Azure Container Networking PR

azure-pipelines · 2025-09-18T13:30:39Z

Azure Pipelines successfully started running 1 pipeline(s).

azure-ipam/ipam.go

NihaNallappagari · 2025-09-22T17:29:25Z

/azp run Azure Container Networking PR

azure-pipelines · 2025-09-22T17:29:36Z

Azure Pipelines successfully started running 1 pipeline(s).

azure-ipam/ipam.go

cns/NetworkContainerContract.go

cns/restserver/ipam.go

* Prefix on NIC v6 support * update dedup comment in ipam * add log for a gatway error scenario * handle synchostversion sync on pon swiftv2 nic * handle gatewayip parse failure or nil scenario * remove unused code Address PR comments remove unnecessary logger update synhost skip test scenario fix linting error updated lint error fix linting error . update synhost skip test scenario fix linting error updated lint error fix linting error . * add test scenario * update test to handle gatway nil case * remove synchost skip and single ip skip . . * Add missing test scenarios * fix ipam_test conflicts * fix conflits small fixes fix lint errors lint fix . Delete examples/imds_nc_lookup.go Signed-off-by: NihaNallappagari <[email protected]> fix lint . * fix linting * add todo and remove multiple interface scenario * Skip add primary ip's to secondary config for swiftv2 pon scenarios fix lint error . * code review comment * Update gateway ipv6 to use default value, that auto detects and adds to neigh table * remove unwanted changes * address ipfamily comment * fix test failure * Handle nilgateway scenario * remove unnedded else block * comments changes --------- Co-authored-by: Kaushik Vuligonda <[email protected]> Co-authored-by: nn052161 <[email protected]>

Copilot AI review requested due to automatic review settings May 13, 2025 22:54

NihaNallappagari requested review from a team as code owners May 13, 2025 22:54

NihaNallappagari requested a review from csfmomo May 13, 2025 22:54

This comment was marked as outdated.

Sign in to view

NihaNallappagari force-pushed the prefixOnNicv6Support branch from 99288e4 to 61784dc Compare May 20, 2025 12:05

tamilmani1989 reviewed Jun 5, 2025

View reviewed changes

rbtr requested a review from Copilot June 6, 2025 15:56

Copilot AI reviewed Jun 6, 2025

View reviewed changes

rbtr requested changes Jun 11, 2025

View reviewed changes

NihaNallappagari force-pushed the prefixOnNicv6Support branch from a00a067 to 7de69b1 Compare June 13, 2025 20:40

tamilmani1989 reviewed Jun 16, 2025

View reviewed changes

azure-ipam/ipconfig/ipconfig.go Outdated Show resolved Hide resolved

cns/restserver/internalapi_linux.go Show resolved Hide resolved

NihaNallappagari force-pushed the prefixOnNicv6Support branch from 8024c9f to 052330e Compare June 17, 2025 21:18

tamilmani1989 requested changes Jun 23, 2025

View reviewed changes

azure-ipam/ipam.go Show resolved Hide resolved

cns/restserver/ipam.go Outdated Show resolved Hide resolved

cns/restserver/internalapi.go Show resolved Hide resolved

NihaNallappagari force-pushed the prefixOnNicv6Support branch 2 times, most recently from 85118ff to 14d0336 Compare June 26, 2025 15:46

tamilmani1989 reviewed Jul 1, 2025

View reviewed changes

azure-ipam/ipam_test.go Outdated Show resolved Hide resolved

cns/restserver/ipam.go Show resolved Hide resolved

NihaNallappagari force-pushed the prefixOnNicv6Support branch 2 times, most recently from b132f7b to 14aa47b Compare July 7, 2025 16:08

github-actions bot added the stale Stale due to inactivity. label Jul 22, 2025

Azure deleted a comment from github-actions bot Jul 28, 2025

github-actions bot removed the stale Stale due to inactivity. label Jul 29, 2025

tamilmani1989 previously approved these changes Aug 6, 2025

View reviewed changes

rbtr requested changes Aug 6, 2025

View reviewed changes

NihaNallappagari dismissed tamilmani1989’s stale review via a166a58 August 7, 2025 21:26

github-actions bot added the stale Stale due to inactivity. label Sep 4, 2025

NihaNallappagari dismissed rbtr’s stale review via 088c586 September 16, 2025 19:11

NihaNallappagari marked this pull request as draft September 16, 2025 23:09

NihaNallappagari force-pushed the prefixOnNicv6Support branch from f6ba445 to 22d6b48 Compare September 17, 2025 18:59

NihaNallappagari marked this pull request as ready for review September 17, 2025 20:08

NihaNallappagari force-pushed the prefixOnNicv6Support branch 2 times, most recently from 4c2c741 to a875692 Compare September 18, 2025 12:40

tamilmani1989 reviewed Sep 19, 2025

View reviewed changes

azure-ipam/ipam.go Outdated Show resolved Hide resolved

Handle nilgateway scenario

d242430

NihaNallappagari force-pushed the prefixOnNicv6Support branch from ecf933e to d242430 Compare September 22, 2025 16:24

remove unnedded else block

ec755f6

tamilmani1989 reviewed Sep 23, 2025

View reviewed changes

azure-ipam/ipam.go Show resolved Hide resolved

cns/NetworkContainerContract.go Show resolved Hide resolved

cns/restserver/ipam.go Outdated Show resolved Hide resolved

cns/restserver/ipam.go Outdated Show resolved Hide resolved

comments changes

6e1a0d9

tamilmani1989 approved these changes Sep 24, 2025

View reviewed changes

rbtr approved these changes Sep 29, 2025

View reviewed changes

Azure deleted a comment from nihanMicrosoft Sep 29, 2025

Azure deleted a comment from azure-pipelines bot Sep 29, 2025

NihaNallappagari enabled auto-merge September 29, 2025 19:50

NihaNallappagari added this pull request to the merge queue Sep 29, 2025

Merged via the queue into Azure:master with commit a1550f2 Sep 29, 2025
101 of 102 checks passed

NihaNallappagari deleted the prefixOnNicv6Support branch September 29, 2025 22:37

Prefix on nicv6 support #3658

Prefix on nicv6 support #3658

Uh oh!

Conversation

NihaNallappagari commented May 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

This comment was marked as outdated.

Uh oh!

NihaNallappagari commented May 13, 2025 • edited by rbtr Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

tamilmani1989 commented Jun 5, 2025

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull Request Overview

Reviewed Changes

Uh oh!

rbtr left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

NihaNallappagari commented Jun 30, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

github-actions bot commented Sep 4, 2025

Uh oh!

NihaNallappagari commented Sep 17, 2025

Uh oh!

azure-pipelines bot commented Sep 17, 2025

Uh oh!

NihaNallappagari commented Sep 18, 2025

Uh oh!

azure-pipelines bot commented Sep 18, 2025

Uh oh!

Uh oh!

NihaNallappagari commented Sep 22, 2025

Uh oh!

azure-pipelines bot commented Sep 22, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

NihaNallappagari commented May 13, 2025 •

edited

Loading

NihaNallappagari commented May 13, 2025 •

edited by rbtr

Loading

NihaNallappagari commented Jun 30, 2025 •

edited

Loading