github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #7866 from Iceber/ctr_tasks_kill

Browse Source 
fix `ctr tasks kill` does not remove cni network under windows
This commit is contained in:
Fu Wei 2022-12-26 14:24:10 +08:00 committed by GitHub
commit 3fefb98f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/ctr/commands/run/run_windows.go
View File

@ -131,6 +131,8 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
return nil, err return nil, err
} }
opts = append(opts, oci.WithWindowsNetworkNamespace(ns.GetPath())) opts = append(opts, oci.WithWindowsNetworkNamespace(ns.GetPath()))
cniMeta := &commands.NetworkMetaData{EnableCni: true}
cOpts = append(cOpts, containerd.WithContainerExtension(commands.CtrCniMetadataExtension, cniMeta))
} }
if context.Bool("isolated") { if context.Bool("isolated") {
opts = append(opts, oci.WithWindowsHyperV) opts = append(opts, oci.WithWindowsHyperV)