containerd-shim-kata: Create the NetworkNs if it hasn't been create

If the networkNs hasn't been created, created it here. Fixes: kata-containers#485 Signed-off-by: fupan <[email protected]>
hyperhq · Sep 17, 2018 · 179a0db · 179a0db
1 parent 25415f7
commit 179a0db
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 1 deletion.
diff --git a/containerd-shim/kata/create.go b/containerd-shim/kata/create.go
@@ -15,7 +15,7 @@ import (
 	vc "github.com/kata-containers/runtime/virtcontainers"
 	vf "github.com/kata-containers/runtime/virtcontainers/factory"
 	"github.com/kata-containers/runtime/virtcontainers/pkg/oci"
-
+	
 	"github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 )
@@ -208,6 +208,11 @@ func createSandbox(ctx context.Context, ociSpec oci.CompatOCISpec, runtimeConfig
 
 	sandboxConfig.Stateful = true
 
+	//setup the networkNamespace if it hasn't been created, such as the using the CNM
+	if err = setupNetworkNamespace(&sandboxConfig.NetworkConfig); err != nil {
+		return nil, err
+	}
+
 	sandbox, err := vci.CreateSandbox(ctx, sandboxConfig)
 	if err != nil {
 		return nil, err

diff --git a/containerd-shim/kata/network.go b/containerd-shim/kata/network.go
@@ -0,0 +1,27 @@
+// Copyright (c) 2018 HyperHQ Inc.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+package kata
+
+import (
+	"github.com/containernetworking/plugins/pkg/ns"
+	vc "github.com/kata-containers/runtime/virtcontainers"
+)
+
+func setupNetworkNamespace(config *vc.NetworkConfig) error {
+	if config.NetNSPath != "" {
+		return nil
+	}
+
+	n, err := ns.NewNS()
+	if err != nil {
+		return err
+	}
+
+	config.NetNSPath = n.Path()
+	config.NetNsCreated = true
+
+	return nil
+}