Skip to content

fix: set EnableIPAMv2 to true for current release train #3502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 15, 2025

Conversation

jpayne3506
Copy link
Contributor

Reason for Change:

Adds EnableIPAMv2 to all CNS configs as it is default enabled for 1.30+.

Issue Fixed:

Requirements:

Notes:

@jpayne3506 jpayne3506 added cns Related to CNS. ci Infra or tooling. release/latest Change affects latest release train labels Mar 12, 2025
@Copilot Copilot AI review requested due to automatic review settings March 12, 2025 23:36
@jpayne3506 jpayne3506 requested a review from a team as a code owner March 12, 2025 23:36
@jpayne3506 jpayne3506 requested a review from orangejuice March 12, 2025 23:36
Copy link
Contributor

@Copilot Copilot AI left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pull Request Overview

This PR updates CNS configuration manifests for integration tests by setting EnableIPAMv2 to true across various CNS config files so that the default behavior for version 1.30+ is correctly reflected.

  • Added the "EnableIPAMv2" flag to all CNS config maps.
  • Updated the AsyncPodDeletePath entry to include a trailing comma to support the new key addition.

Reviewed Changes

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

Show a summary per file
File Description
test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml Added "EnableIPAMv2" flag and updated formatting on AsyncPodDeletePath
test/integration/manifests/cnsconfig/overlayconfigmap.yaml Added "EnableIPAMv2" flag and comma adjustment for AsyncPodDeletePath
test/integration/manifests/cnsconfig/ciliumconfigmap.yaml Added "EnableIPAMv2" flag and updated AsyncPodDeletePath format
test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml Added "EnableIPAMv2" flag with updated comma on AsyncPodDeletePath
test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml Added "EnableIPAMv2" flag and adjusted comma on AsyncPodDeletePath
test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml Added "EnableIPAMv2" flag and updated AsyncPodDeletePath formatting
test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml Added "EnableIPAMv2" flag with updated comma on AsyncPodDeletePath
test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml Added "EnableIPAMv2" flag and adjusted AsyncPodDeletePath comma
test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml Added "EnableIPAMv2" flag and updated formatting on AsyncPodDeletePath
Comments suppressed due to low confidence (9)

test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml:32

  • Verify that the trailing comma after AsyncPodDeletePath is valid in this configuration context to avoid potential parsing issues.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/overlayconfigmap.yaml:32

  • Verify that the trailing comma after AsyncPodDeletePath is acceptable in this manifest to ensure proper configuration parsing.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/ciliumconfigmap.yaml:32

  • Confirm that the updated comma formatting for AsyncPodDeletePath is compatible with the expected configuration file format.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml:29

  • Ensure that introducing a trailing comma for AsyncPodDeletePath does not lead to syntax issues in this configuration.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml:32

  • Review the trailing comma addition for AsyncPodDeletePath to confirm its compatibility with the expected configuration parser.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml:32

  • Verify that the trailing comma added for AsyncPodDeletePath aligns with the configuration file's required format.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml:34

  • Confirm that the trailing comma in AsyncPodDeletePath is appropriate and does not cause issues when the configuration is parsed.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml:34

  • Review the change to include a trailing comma after AsyncPodDeletePath to ensure it conforms to the expected file format.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml:34

  • Make sure that the addition of a trailing comma on the AsyncPodDeletePath line is valid in this configuration to prevent parsing errors.
"AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",

@jpayne3506
Copy link
Contributor Author

/azp list

Copy link

@jpayne3506
Copy link
Contributor Author

/azp run Azure Container Networking PR, CNI Release Test

@Azure Azure deleted a comment from azure-pipelines bot Mar 12, 2025
Copy link

Azure Pipelines successfully started running 2 pipeline(s).

@jpayne3506 jpayne3506 enabled auto-merge March 13, 2025 19:00
@jpayne3506 jpayne3506 added this pull request to the merge queue Mar 13, 2025
github-merge-queue bot pushed a commit that referenced this pull request Mar 13, 2025

Verified

This commit was signed with the committer’s verified signature.
heitorlessa Heitor Lessa
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 14, 2025
@paulyufan2 paulyufan2 added this pull request to the merge queue Mar 14, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Mar 14, 2025
@jpayne3506 jpayne3506 added this pull request to the merge queue Mar 14, 2025
Merged via the queue into master with commit 50303e5 Mar 15, 2025
225 of 234 checks passed
@jpayne3506 jpayne3506 deleted the jpayne3506/cns-config-1.30 branch March 15, 2025 01:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci Infra or tooling. cns Related to CNS. release/latest Change affects latest release train
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants