fix: add windows async delete mounts (#2458)

* fix: add windows async delete mounts

* ci: enable async delete on cnsconfig maps

* ci: add mount overwrite to utils

Author: jpayne3506

test/integration/manifests/cns/daemonset-windows.yaml

@@ -74,6 +74,8 @@ spec:
               mountPath: /etc/azure-cns
             - name: cni-conflist
               mountPath: /k/azurecni/netconf
+            - name: azure-vnet
+              mountPath: /var/run/azure-vnet
           ports:
             - containerPort: 10090
               hostPort: 10090
@@ -130,5 +132,9 @@ spec:
           hostPath:
             path: /k/azurecni/bin
             type: Directory # // TODO: add windows cni conflist when ready
+        - name: azure-vnet
+          hostPath:
+            path: /var/run/azure-vnet
+            type: DirectoryOrCreate
       serviceAccount: azure-cns
       serviceAccountName: azure-cns

test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml

@@ -0,0 +1,33 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: cns-config
+  namespace: kube-system
+data:
+  cns_config.json: |
+    {
+      "TelemetrySettings": {
+          "TelemetryBatchSizeBytes": 16384,
+          "TelemetryBatchIntervalInSecs": 15,
+          "RefreshIntervalInSecs": 15,
+          "DisableAll": false,
+          "HeartBeatIntervalInMins": 30,
+          "DebugMode": false,
+          "SnapshotIntervalInMins": 60
+      },
+      "ManagedSettings": {
+          "PrivateEndpoint": "",
+          "InfrastructureNetworkID": "",
+          "NodeID": "",
+          "NodeSyncIntervalInSeconds": 30
+      },
+      "ChannelMode": "CRD",
+      "InitializeFromCNI": true,
+      "ManageEndpointState": false,
+      "ProgramSNATIPTables" : false,
+      "EnableCNIConflistGeneration": true,
+      "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
+      "CNIConflistScenario": "overlay",
+      "EnableAsyncPodDelete": false,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
+    }

test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml

@@ -29,5 +29,7 @@ data:
       "MetricsBindAddress": ":10092",
       "EnableCNIConflistGeneration": false,
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
-      "CNIConflistScenario": "dualStackOverlay"
+      "CNIConflistScenario": "dualStackOverlay",
+      "EnableAsyncPodDelete": false,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
     }

test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml

@@ -27,5 +27,7 @@ data:
       "ProgramSNATIPTables" : false,
       "EnableCNIConflistGeneration": true,
       "CNIConflistFilepath": "/etc/cni/net.d/15-azure-swift-overlay.conflist",
-      "CNIConflistScenario": "v4overlay"
+      "CNIConflistScenario": "v4overlay",
+      "EnableAsyncPodDelete": true,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
     }

test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml

@@ -29,5 +29,7 @@ data:
       "MetricsBindAddress": ":10092",
       "EnableCNIConflistGeneration": false,
       "CNIConflistFilepath": "C:\\k\\azurecni\\netconf\\10-azure.conflist",
-      "CNIConflistScenario": "v4overlay"
+      "CNIConflistScenario": "v4overlay",
+      "EnableAsyncPodDelete": true,
+      "AsyncPodDeletePath": "/var/run/azure-vnet/deleteIDs"
     }

test/internal/kubernetes/utils_create.go

@@ -316,6 +316,7 @@ func initCNSScenarioVars() (map[CNSScenario]map[corev1.OSName]cnsDetails, error)
 	cnsOverlayConfigMapPath := cnsConfigFolder + "/overlayconfigmap.yaml"
 	cnsAzureCNIOverlayLinuxConfigMapPath := cnsConfigFolder + "/azurecnioverlaylinuxconfigmap.yaml"
 	cnsAzureCNIOverlayWindowsConfigMapPath := cnsConfigFolder + "/azurecnioverlaywindowsconfigmap.yaml"
+	cnsAzureCNIDualStackLinuxConfigMapPath := cnsConfigFolder + "/azurecnidualstackoverlaylinuxconfigmap.yaml"
 	cnsAzureCNIDualStackWindowsConfigMapPath := cnsConfigFolder + "/azurecnidualstackoverlaywindowsconfigmap.yaml"
 	cnsRolePath := cnsManifestFolder + "/role.yaml"
 	cnsRoleBindingPath := cnsManifestFolder + "/rolebinding.yaml"
@@ -439,7 +440,7 @@ func initCNSScenarioVars() (map[CNSScenario]map[corev1.OSName]cnsDetails, error)
 					"azure-swift-overlay-dualstack.conflist", "-o", "/etc/cni/net.d/10-azure.conflist",
 				},
 				initContainerName:  initContainerNameCNI,
-				configMapPath:      cnsSwiftConfigMapPath,
+				configMapPath:      cnsAzureCNIDualStackLinuxConfigMapPath,
 				installIPMasqAgent: true,
 			},
 			corev1.Windows: {
@@ -673,6 +674,15 @@ func volumesForAzureCNIOverlayWindows() []corev1.Volume {
 				},
 			},
 		}, // TODO: add windows cni conflist when ready
+		{
+			Name: "azure-vnet",
+			VolumeSource: corev1.VolumeSource{
+				HostPath: &corev1.HostPathVolumeSource{
+					Path: "/var/run/azure-vnet",
+					Type: hostPathTypePtr(corev1.HostPathDirectoryOrCreate),
+				},
+			},
+		},
 	}
 }
 
@@ -745,5 +755,9 @@ func cnsVolumeMountsForAzureCNIOverlayWindows() []corev1.VolumeMount {
 			Name:      "cni-bin",
 			MountPath: "/k/azurecni/bin",
 		}, // TODO: add windows cni conflist when ready
+		{
+			Name:      "azure-vnet",
+			MountPath: "/var/run/azure-vnet",
+		},
 	}
 }