Skip to content

chore: add swiftv2 windows conflist #4144

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

chore: add swiftv2 windows conflist #4144

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e3526bd
add swiftv2 windows conflist
jackieluc Nov 24, 2025
926dc06
lint: spaces
jackieluc Nov 25, 2025
7860e82
feat: add disableAsyncDelete config
jackieluc Nov 25, 2025
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
22 changes: 22 additions & 0 deletions cni/azure-windows-swiftv2-stateless.conflist
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"cniVersion": "1.0.0",
"name": "azure",
"type": "azure-vnet",
"mode": "bridge",
Copy link
Member

@tamilmani1989 tamilmani1989 Nov 24, 2025

Choose a reason for hiding this comment

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

add "disableAsyncDelete": true

Copy link
Member Author

@jackieluc jackieluc Nov 25, 2025

Choose a reason for hiding this comment

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

added

"bridge": "azure0",
"capabilities": {
"portMappings": true,
"dns": true
},
"ipam": {
"type": "azure-cns"
},
"dns": {
"Nameservers": [
"168.63.129.16"
],
"Search": [
"svc.cluster.local"
Copy link
Member

@tamilmani1989 tamilmani1989 Nov 24, 2025

Choose a reason for hiding this comment

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

do we need search? can remove this.

Copy link
Member Author

@jackieluc jackieluc Nov 25, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

we don't need Search functionally speaking for Standalone scenarios, but network_windows.go would error if there is a mismatch in length between NameServers and Search: https://github.com/jackieluc/azure-container-networking/blob/stateless-cni-conflist/cni/network/network_windows.go#L147-L150

]
}
Copy link

Copilot AI Nov 24, 2025

Choose a reason for hiding this comment

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

This conflist file is missing the required plugins array structure. According to the CNI specification and all other conflist files in this repository, the configuration should have a plugins array containing the plugin configurations.

The structure should be:

{
    "cniVersion": "1.0.0",
    "name": "azure",
    "plugins": [
        {
            "type": "azure-vnet",
            "mode": "bridge",
            "bridge": "azure0",
            ...
        }
    ]
}

See cni/azure-windows-baremetal.conflist (lines 1-50) and cni/azure-windows-swift.conflist (lines 1-51) for examples of the correct structure.

Suggested change
"type": "azure-vnet",
"mode": "bridge",
"bridge": "azure0",
"capabilities": {
"portMappings": true,
"dns": true
},
"ipam": {
"type": "azure-cns"
},
"dns": {
"Nameservers": [
"168.63.129.16"
],
"Search": [
"svc.cluster.local"
]
}
"plugins": [
{
"type": "azure-vnet",
"mode": "bridge",
"bridge": "azure0",
"capabilities": {
"portMappings": true,
"dns": true
},
"ipam": {
"type": "azure-cns"
},
"dns": {
"Nameservers": [
"168.63.129.16"
],
"Search": [
"svc.cluster.local"
]
}
}
]

Copilot uses AI. Check for mistakes.
}
Loading