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

Merge pull request #8175 from Iceber/fix_cni_metadata

Browse Source 
adding cni metadata to the container in the `ctr run --config`
This commit is contained in:
Fu Wei
2023-03-16 23:29:48 +08:00
committed by GitHub
parent 732d184cbb 5fdca538d0
commit e208c24256
2 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cmd/ctr/commands/run/run_unix.go
View File

@@ -238,10 +238,6 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
opts = append(opts, oci.WithAnnotations(annos))
}
if context.Bool("cni") {
cniMeta := &commands.NetworkMetaData{EnableCni: true}
cOpts = append(cOpts, containerd.WithContainerExtension(commands.CtrCniMetadataExtension, cniMeta))
}
if caps := context.StringSlice("cap-add"); len(caps) > 0 {
for _, cap := range caps {
if !strings.HasPrefix(cap, "CAP_") {
@@ -374,6 +370,11 @@ func NewContainer(ctx gocontext.Context, client *containerd.Client, context *cli
}
}
if context.Bool("cni") {
cniMeta := &commands.NetworkMetaData{EnableCni: true}
cOpts = append(cOpts, containerd.WithContainerExtension(commands.CtrCniMetadataExtension, cniMeta))
}
runtimeOpts, err := getRuntimeOptions(context)
if err != nil {
return nil, err