From 26411e5d48d4d05c87589fa8e5fee93e716a7d48 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Wed, 20 Dec 2023 07:26:13 -0800 Subject: [PATCH 1/3] fix: add windows async delete mounts --- test/integration/manifests/cns/daemonset-windows.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/integration/manifests/cns/daemonset-windows.yaml b/test/integration/manifests/cns/daemonset-windows.yaml index 571109a7e8..f8c3c8c065 100644 --- a/test/integration/manifests/cns/daemonset-windows.yaml +++ b/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 From c45dae9d50f48ba73bfd96b29f55f44e9b0ae628 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Wed, 20 Dec 2023 09:52:18 -0800 Subject: [PATCH 2/3] ci: enable async delete on cnsconfig maps --- ...zurecnidualstackoverlaylinuxconfigmap.yaml | 33 +++++++++++++++++++ ...recnidualstackoverlaywindowsconfigmap.yaml | 4 ++- .../azurecnioverlaylinuxconfigmap.yaml | 4 ++- .../azurecnioverlaywindowsconfigmap.yaml | 4 ++- test/internal/kubernetes/utils_create.go | 3 +- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml new file mode 100644 index 0000000000..b893c3b5aa --- /dev/null +++ b/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" + } diff --git a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml index 8ee0691a3b..f72add070c 100644 --- a/test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml +++ b/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" } diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml index e0fa3002c6..cde7927bb0 100644 --- a/test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml +++ b/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" } diff --git a/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml b/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml index c303cdbca1..422dc462fa 100644 --- a/test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml +++ b/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" } diff --git a/test/internal/kubernetes/utils_create.go b/test/internal/kubernetes/utils_create.go index 8137fb8d94..e5898ba8ef 100644 --- a/test/internal/kubernetes/utils_create.go +++ b/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: { From 62cba1c08ca52c29d44eb91176c8c3a15c6c2dd7 Mon Sep 17 00:00:00 2001 From: jpayne3506 Date: Fri, 22 Dec 2023 13:57:05 -0800 Subject: [PATCH 3/3] ci: add mount overwrite to utils --- test/internal/kubernetes/utils_create.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/internal/kubernetes/utils_create.go b/test/internal/kubernetes/utils_create.go index e5898ba8ef..6e8e7e9854 100644 --- a/test/internal/kubernetes/utils_create.go +++ b/test/internal/kubernetes/utils_create.go @@ -674,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), + }, + }, + }, } } @@ -746,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", + }, } }