x/stackube
Code Issues Proposed changes

Merge "Fix netns for docker containers."

Browse Source
This commit is contained in:
Jenkins 2017-08-01 08:05:01 +00:00 committed by Gerrit Code Review
commit ad42b9de82
2 changed files with 49 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
cmd/kubestack/kubestack.go
View File

@ -23,7 +23,9 @@ import (
"net"
"os"
"path"
"path/filepath"
"runtime"
"strings"
"git.openstack.org/openstack/stackube/pkg/kubestack/plugins"
kubestacktypes "git.openstack.org/openstack/stackube/pkg/kubestack/types"
@ -46,6 +48,8 @@ import (
var (
// VERSION is filled out during the build process (using git describe output)
VERSION = "0.1"
netnsBasePath = "/var/run/netns"
)
// OpenStack describes openstack client and its plugins.
@ -224,9 +228,20 @@ func cmdAdd(args *skel.CmdArgs) error {
defer netns.Close()
// Setup interface for pod
var netnsName string
_, cidr, _ := net.ParseCIDR(subnet.Cidr)
prefixSize, _ := cidr.Mask.Size()
netnsName := path.Base(netns.Path())
if strings.HasPrefix(netnsBasePath, netns.Path()) {
// container runtime has already made the symlink for netns.
netnsName = path.Base(netns.Path())
} else {
netnsName = podName
destPath := filepath.Join(netnsBasePath, netnsName)
if err := util.NetnsSymlink(netns.Path(), destPath); err != nil {
return fmt.Errorf("error of symlink %q: %v", destPath, err)
}
}
brInterface, conInterface, err := os.Plugin.SetupInterface(portName, args.ContainerID, port,
fmt.Sprintf("%s/%d", port.FixedIPs[0].IPAddress, prefixSize),
subnet.Gateway, args.IfName, netnsName)
@ -265,7 +280,7 @@ func cmdAdd(args *skel.CmdArgs) error {
}
func cmdDel(args *skel.CmdArgs) error {
os, _, err := initOpenstack(args.StdinData)
osClient, _, err := initOpenstack(args.StdinData)
if err != nil {
glog.Errorf("Init OpenStack failed: %v", err)
return err
@ -282,7 +297,7 @@ func cmdDel(args *skel.CmdArgs) error {
portName := util.BuildPortName(podNamespace, podName)
// Get port from openstack
port, err := os.Client.GetPort(portName)
port, err := osClient.Client.GetPort(portName)
if err != nil {
glog.Errorf("GetPort %s failed: %v", portName, err)
return err
@ -294,19 +309,35 @@ func cmdDel(args *skel.CmdArgs) error {
glog.V(4).Infof("Pod %s's port is %v", podName, port)
// Delete interface
err = os.Plugin.DestroyInterface(portName, args.ContainerID, port)
err = osClient.Plugin.DestroyInterface(portName, args.ContainerID, port)
if err != nil {
glog.Errorf("DestroyInterface for pod %s failed: %v", podName, err)
return err
}
// Delete port from openstack
err = os.Client.DeletePort(portName)
err = osClient.Client.DeletePort(portName)
if err != nil {
glog.Errorf("DeletePort %s failed: %v", portName, err)
return err
}
// Remove netns symlink.
netns, err := ns.GetNS(args.Netns)
if err != nil {
glog.Warningf("failed to open netns %q: %v, suppose already deleted", args.Netns, err)
return nil
}
defer netns.Close()
if !strings.HasPrefix(netnsBasePath, netns.Path()) {
destPath := filepath.Join(netnsBasePath, podName)
if _, err := os.Stat(destPath); !os.IsNotExist(err) {
if err = os.Remove(destPath); err != nil {
glog.Warningf("failed to remove %q: %v", destPath, err)
}
}
}
return nil
}

13
pkg/util/util.go
View File

@ -18,6 +18,8 @@ package util
import (
"errors"
"os"
"path/filepath"
apiv1 "k8s.io/api/core/v1"
)
@ -66,3 +68,14 @@ func IsSystemNamespace(ns string) bool {
}
return false
}
// NetnsSymlink make a symlink for a netns path.
func NetnsSymlink(source, dest string) error {
dir := filepath.Dir(dest)
// create dst dir if not exist.
if _, err := os.Stat(dir); os.IsNotExist(err) {
os.MkdirAll(dir, 0750)
}
return os.Symlink(source, dest)
}