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

fix: ctr run --cni get failed

Browse Source 
when   user  executes ctr run --cni to start a container,it will call cni plugin to create network .But when user kills it,the network won’t be removed. if we run a container with same namespace and name again will trigger a bug. we should remove the network when user kills task if it enables cni plugin.

Fix:#6604

Signed-off-by: SongJiang Han <songjiang.dark@gmail.com>
This commit is contained in:
songjiang han
2022-03-11 23:50:20 +08:00
parent d4641e1ce1
commit 2a0b2ee9eb
4 changed files with 95 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
cmd/ctr/commands/run/run.go
View File

@@ -17,7 +17,6 @@
package run
import (
"context"
gocontext "context"
"encoding/csv"
"errors"
@@ -31,7 +30,6 @@ import (
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
"github.com/containerd/containerd/containers"
clabels "github.com/containerd/containerd/labels"
"github.com/containerd/containerd/namespaces"
"github.com/containerd/containerd/oci"
gocni "github.com/containerd/go-cni"
specs "github.com/opencontainers/runtime-spec/specs-go"
@@ -196,7 +194,7 @@ var Command = cli.Command{
if !detach {
defer func() {
if enableCNI {
if err := network.Remove(ctx, fullID(ctx, container), ""); err != nil {
if err := network.Remove(ctx, commands.FullID(ctx, container), ""); err != nil {
logrus.WithError(err).Error("network review")
}
}
@@ -218,7 +216,7 @@ var Command = cli.Command{
return err
}
if _, err := network.Setup(ctx, fullID(ctx, container), netNsPath); err != nil {
if _, err := network.Setup(ctx, commands.FullID(ctx, container), netNsPath); err != nil {
return err
}
}
@@ -251,15 +249,6 @@ var Command = cli.Command{
},
}
func fullID(ctx context.Context, c containerd.Container) string {
id := c.ID()
ns, ok := namespaces.Namespace(ctx)
if !ok {
return id
}
return fmt.Sprintf("%s-%s", ns, id)
}
// buildLabel builds the labels from command line labels and the image labels
func buildLabels(cmdLabels, imageLabels map[string]string) map[string]string {
labels := make(map[string]string)

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

@@ -214,6 +214,10 @@ 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))
}
if caps := context.StringSlice("cap-add"); len(caps) > 0 {
for _, cap := range caps {
if !strings.HasPrefix(cap, "CAP_") {