Conversation
nairashu
requested review from
FumingZhang,
jsntcy,
yanzhudd and
zhoxing-ms
as code owners
️✔️AzureCLI-FullTest
|
|
Hi @nairashu, |
❌AzureCLI-BreakingChangeTest
Please submit your Breaking Change Pre-announcement ASAP if you haven't already. Please note:
|
Collaborator
|
Thank you for your contribution! We will review the pull request and get back to you soon. |
|
The git hooks are available for azure-cli and azure-cli-extensions repos. They could help you run required checks before creating the PR. Please sync the latest code with latest dev branch (for azure-cli) or main branch (for azure-cli-extensions). pip install azdev --upgrade
azdev setup -c <your azure-cli repo path> -r <your azure-cli-extensions repo path>
|
microsoft-github-policy-service
bot
added
Auto-Assign
Contributor
There was a problem hiding this comment.
Pull Request Overview
Adds support for the new --pod-ip-allocation-mode flag to both az aks create and az aks nodepool add, enabling Azure CNI Static Block GA scenarios.
- Introduces the
pod_ip_allocation_modeparameter in command signatures, validators, and parameter loading. - Extends the agentpool decorator to get and set
pod_ip_allocation_modeon theAgentPoolprofile. - Adds constants, help documentation, and tests covering DynamicIndividual and StaticBlock modes.
Reviewed Changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 1 comment.
Show a summary per file
| File | Description |
|---|---|
| src/azure-cli/azure/cli/command_modules/acs/_consts.py | Added constants for pod IP allocation modes. |
| src/azure-cli/azure/cli/command_modules/acs/_validators.py | Implemented validate_pod_ip_allocation_mode. |
| src/azure-cli/azure/cli/command_modules/acs/_params.py | Registered the new argument with enum type and validator. |
| src/azure-cli/azure/cli/command_modules/acs/_help.py | Added help entries and examples for the new flag. |
| src/azure-cli/azure/cli/command_modules/acs/custom.py | Updated aks_create and aks_agentpool_add to accept the parameter. |
| src/azure-cli/azure/cli/command_modules/acs/agentpool_decorator.py | Extended context and decorator to handle the new flag. |
Tests in test_managed_cluster_decorator.py, test_aks_commands.py, and test_agentpool_decorator.py |
Added assertions and a full create flow for StaticBlock mode. |
Comments suppressed due to low confidence (2)
src/azure-cli/azure/cli/command_modules/acs/agentpool_decorator.py:780
- The logic inverts the intended fallback: you override only when
pod_ip_allocation_modeis truthy. It should instead use the agentpool value only when the raw parameter is not provided (e.g.,if pod_ip_allocation_mode is None and self.agentpool and ...).
if (pod_ip_allocation_mode and self.agentpool and self.agentpool.pod_ip_allocation_mode is not None):
src/azure-cli/azure/cli/command_modules/acs/agentpool_decorator.py:766
- The method signature incorrectly annotates
selfasbool = False; it should bedef get_pod_ip_allocation_mode(self) -> Union[str, None]:to match other context getters.
def get_pod_ip_allocation_mode(self: bool = False) -> Union[str, None]:
Member
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
FumingZhang
reviewed
May 23, 2025
Member
FumingZhang
left a comment
FumingZhang
left a comment
There was a problem hiding this comment.
lgtm
Queued live test to validate the change.
- test_aks_create_with_pod_ip_allocation_mode_static_block
Member
|
depends on 2025-04-01 API version, updated milestone to https://github.com/Azure/azure-cli/milestone/157 |
Contributor
Author
|
/azp run |
|
Commenter does not have sufficient privileges for PR 31544 in repo Azure/azure-cli |
Collaborator
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
Member
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
nairashu
force-pushed
the
asn/StaticBlockGA
branch
from
8dd699d to
14dfc78
Compare
Contributor
Author
|
/azp run |
|
Commenter does not have sufficient privileges for PR 31544 in repo Azure/azure-cli |
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
FumingZhang
reviewed
Jun 24, 2025
Member
|
Queued live test to validate the change. If the test passed, you could find the new recording file from the pipeline artifact.
|
zhoxing-ms
reviewed
Jun 24, 2025
zhoxing-ms
reviewed
Jun 24, 2025
Co-authored-by: Xing Zhou <Zhou.Xing@microsoft.com>
Contributor
Author
|
@zhoxing-ms : I believe there is still time for the cut-off and I am trying my best to get this in the July milestone. This feature GA is to be announced on 6/30. |
Contributor
|
Sorry, I'm very busy this morning. @yanzhudd Please help me keep an eye on this PR and make it merged as smooth as possible in this sprint |
zhoxing-ms
previously approved these changes
Jun 24, 2025
Contributor
Author
|
@yanzhudd : Could you trigger the pipelines once more. |
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
zhoxing-ms
previously approved these changes
Jun 24, 2025
FumingZhang
reviewed
Jun 24, 2025
Co-authored-by: FumingZhang <81607949+FumingZhang@users.noreply.github.com>
Member
|
/azp run |
|
Azure Pipelines successfully started running 3 pipeline(s). |
FumingZhang
approved these changes
Jun 24, 2025
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.
[AKS]
az aks createandaz aks nodepool add: Add--pod-ip-allocation-modeto the agentpool profile in AKS for Azure CNI Static Block GA feature supportRelated command
az aks createaz aks nodepool addDescription
Add Azure CNI Static Block related change from preview. Adding flags & validation to below commands
az aks createaz aks nodepool addAzure CLI extension PR: Azure/azure-cli-extensions#7288
This property is added to the network profile of an Agentpool in AKS to describe the type of IPAM when using Azure CNI.
Testing Guide
az aks create <CLUSTER_NAME> --network-plugin azure --vnet-subnet-id <NODE_SUBNET_ID> --pod-subnet-id <POD_SUBNET_ID> --pod-ip-allocation-mode <"DynamicIndividual or StaticBlock"> --max-pods 80az aks nodepool add <NODEPOOL_NAME> --pod-subnet-id <POD_SUBNET_ID> --pod-ip-allocation-mode <"DynamicIndividual or StaticBlock"> --max-pods 80Example:
History Notes
[AKS]
az aks create: Add--pod-ip-allocation-modeparameter to support Azure CNI Static Block Allocation[AKS]
az aks nodepool add: Add--pod-ip-allocation-modeparameter to support Azure CNI Static Block AllocationThis checklist is used to make sure that common guidelines for a pull request are followed.
The PR title and description has followed the guideline in Submitting Pull Requests.
I adhere to the Command Guidelines.
I adhere to the Error Handling Guidelines.