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

jpayne3506 · web-flow · commit 50303e5879b2 · 2025-03-14T17:02:53.000Z
diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml
@@ -29,5 +29,6 @@ data:
       "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
       "CNIConflistScenario": "overlay",
       "EnableAsyncPodDelete": false,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml
@@ -31,5 +31,6 @@ data:
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "dualStackOverlay",
       "EnableAsyncPodDelete": false,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml
@@ -29,5 +29,6 @@ data:
       "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml
@@ -31,5 +31,6 @@ data:
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurestatelesscnioverlaywindowsconfigmap.yaml
@@ -31,5 +31,6 @@ data:
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
       "CNIConflistScenario": "v4overlay",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml b/test/integration/manifests/cnsconfig/ciliumconfigmap.yaml
@@ -29,5 +29,6 @@ data:
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml b/test/integration/manifests/cnsconfig/ciliumnodesubnetconfigmap.yaml
@@ -29,5 +29,6 @@ data:
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/overlayconfigmap.yaml b/test/integration/manifests/cnsconfig/overlayconfigmap.yaml
@@ -29,5 +29,6 @@ data:
       "CNIConflistFilepath": "/etc/cni/net.d/05-cilium.conflist",
       "CNIConflistScenario": "cilium",
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }
diff --git a/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/swiftwindowsconfigmap.yaml
@@ -26,5 +26,6 @@ data:
       "ManageEndpointState": false,
       "ProgramSNATIPTables": false,
       "EnableAsyncPodDelete": true,
-      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",
+      "EnableIPAMv2": true
     }

Original file line number	Diff line number	Diff line change
`@@ -29,5 +29,6 @@ data:`
`29`	`29`	`"CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",`
`30`	`30`	`"CNIConflistScenario": "overlay",`
`31`	`31`	`"EnableAsyncPodDelete": false,`
`32`		`- "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"`
	`32`	`+ "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",`
	`33`	`+ "EnableIPAMv2": true`
`33`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,5 +31,6 @@ data:`
`31`	`31`	`"CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",`
`32`	`32`	`"CNIConflistScenario": "dualStackOverlay",`
`33`	`33`	`"EnableAsyncPodDelete": false,`
`34`		`- "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"`
	`34`	`+ "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",`
	`35`	`+ "EnableIPAMv2": true`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,5 +26,6 @@ data:`
`26`	`26`	`"ManageEndpointState": false,`
`27`	`27`	`"ProgramSNATIPTables": false,`
`28`	`28`	`"EnableAsyncPodDelete": true,`
`29`		`- "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"`
	`29`	`+ "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs",`
	`30`	`+ "EnableIPAMv2": true`
`30`	`31`	`}`