github/containerd
2
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
commit e208c24256
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 6 deletions
Show Stats 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)) 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 { if caps := context.StringSlice("cap-add"); len(caps) > 0 {
for _, cap := range caps { for _, cap := range caps {
if !strings.HasPrefix(cap, "CAP_") { 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) runtimeOpts, err := getRuntimeOptions(context)
if err != nil { if err != nil {
return nil, err return nil, err

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

@ -131,8 +131,6 @@ 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)
@ -165,6 +163,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))
}
runtime := context.String("runtime") runtime := context.String("runtime")
var runtimeOpts interface{} var runtimeOpts interface{}
if runtime == "io.containerd.runhcs.v1" { if runtime == "io.containerd.runhcs.v1" {