fix: in case of azure cni overlay use correct options to match RP#8609
Merged
Conversation
awesomenix
requested review from
AbelHu,
Devinwong,
SriHarsha001,
calvin197,
cameronmeissner,
djsly,
ganeshkumarashok,
junjiezhang1997,
lilypan26,
mxj220,
pdamianov-dev,
phealy,
r2k1,
sulixu,
surajssd,
timmy-wright and
zachary-bailey
as code owners
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes the Test_Ubuntu2204_AzureCNI e2e scenario so that the node bootstrapping configuration matches how the AKS RP actually configures nodes for an Azure CNI Overlay cluster. With overlay, the RP sets NetworkPlugin=none on the node and applies two well-known labels (podnetwork-type=overlay and nodenetwork-vnetguid=<vnet GUID>) so the in-cluster Azure CNI overlay components configure the node correctly. To support this, the Cluster struct now also surfaces the VNet's resourceGUID.
Changes:
- Switch the overlay scenario's NBC mutator to
NetworkPluginNoneand add the two overlay-specific node labels. - Extend
VNetandClusterwithresourceGUID/VNetResourceGUIDand populate it fromgetClusterVNet. - Fetch the VNet in
prepareCluster(in parallel viadag.Go) so the GUID is available to all scenarios.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
| e2e/scenario_test.go | Reconfigure Test_Ubuntu2204_AzureCNI overlay scenario: NetworkPlugin=none plus overlay/VNet-GUID node labels. |
| e2e/cluster.go | Add VNetResourceGUID to Cluster, plumb it through prepareCluster, and read ResourceGUID from the AKS VNet in getClusterVNet. |
Devinwong
approved these changes
May 29, 2026
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
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.
fix azure cni with overlay