Skip to content
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.

Sign up for GitHub

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

fix: add windows async delete mounts #2458

Merged
merged 3 commits into from
Dec 23, 2023
Merged

fix: add windows async delete mounts #2458

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26411e5
fix: add windows async delete mounts
jpayne3506 Dec 20, 2023
c45dae9
ci: enable async delete on cnsconfig maps
jpayne3506 Dec 20, 2023
62cba1c
ci: add mount overwrite to utils
jpayne3506 Dec 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions test/integration/manifests/cns/daemonset-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
33 changes: 33 additions & 0 deletions test/integration/manifests/cnsconfig/azurecnidualstackoverlaylinuxconfigmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
}
4 changes: 3 additions & 1 deletion test/integration/manifests/cnsconfig/azurecnidualstackoverlaywindowsconfigmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 3 additions & 1 deletion test/integration/manifests/cnsconfig/azurecnioverlaylinuxconfigmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
4 changes: 3 additions & 1 deletion test/integration/manifests/cnsconfig/azurecnioverlaywindowsconfigmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
3 changes: 2 additions & 1 deletion test/internal/kubernetes/utils_create.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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: {
Expand Down