Skip to content

sdn: fix single-tenant pod setup and leave docker0 around #11588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 27, 2016
Merged

sdn: fix single-tenant pod setup and leave docker0 around #11588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dca211b
sdn: fix single-tenant pod setup
dcbw Oct 26, 2016
2000b4b
sdn: no longer kill docker0
dcbw Oct 26, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions pkg/sdn/plugin/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,14 +308,6 @@ func (plugin *OsdnNode) SetupSDN() (bool, error) {
return false, err
}

// Clean up docker0 since docker won't
itx = ipcmd.NewTransaction(exec, "docker0")
itx.SetLink("down")
itx.IgnoreError()
itx.DeleteLink()
itx.IgnoreError()
_ = itx.EndTransaction()

sysctl := sysctl.New()

// Enable IP forwarding for ipv4 packets
Expand Down
20 changes: 13 additions & 7 deletions pkg/sdn/plugin/pod_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const (
)

type PodConfig struct {
vnid string
vnid uint32
ingressBandwidth string
egressBandwidth string
wantMacvlan bool
Expand Down Expand Up @@ -86,14 +86,14 @@ func wantsMacvlan(pod *kapi.Pod) (bool, error) {
// Create and return a PodConfig describing which openshift-sdn specific pod attributes
// to configure
func (m *podManager) getPodConfig(req *cniserver.PodRequest) (*PodConfig, *kapi.Pod, error) {
config := &PodConfig{}
var err error

config := &PodConfig{}
if m.multitenant {
vnid, err := m.vnids.GetVNID(req.PodNamespace)
config.vnid, err = m.vnids.GetVNID(req.PodNamespace)
if err != nil {
return nil, nil, err
}
config.vnid = strconv.FormatUint(uint64(vnid), 10)
}

pod, err := m.kClient.Pods(req.PodNamespace).Get(req.PodName)
Expand Down Expand Up @@ -255,6 +255,10 @@ func getScriptError(output []byte) string {
return string(output)
}

func vnidToString(vnid uint32) string {
return strconv.FormatUint(uint64(vnid), 10)
}

// Set up all networking (host/container veth, OVS flows, IPAM, loopback, etc)
func (m *podManager) setup(req *cniserver.PodRequest) (*cnitypes.Result, *kubehostport.RunningPod, error) {
podConfig, pod, err := m.getPodConfig(req)
Expand Down Expand Up @@ -324,11 +328,12 @@ func (m *podManager) setup(req *cniserver.PodRequest) (*cnitypes.Result, *kubeho
}

contVethMac := contVeth.Attrs().HardwareAddr.String()
out, err := exec.Command(sdnScript, setUpCmd, hostVeth.Attrs().Name, contVethMac, podIP.String(), podConfig.vnid, podConfig.ingressBandwidth, podConfig.egressBandwidth).CombinedOutput()
vnidStr := vnidToString(podConfig.vnid)
out, err := exec.Command(sdnScript, setUpCmd, hostVeth.Attrs().Name, contVethMac, podIP.String(), vnidStr, podConfig.ingressBandwidth, podConfig.egressBandwidth).CombinedOutput()
glog.V(5).Infof("SetUpPod network plugin output: %s, %v", string(out), err)

if isScriptError(err) {
return nil, nil, fmt.Errorf("error running network setup script:\nhostVethName %s, contVethMac %s, podIP %s, podConfig %#v\n %s", hostVeth.Attrs().Name, contVethMac, podIP.String(), podConfig, out)
return nil, nil, fmt.Errorf("error running network setup script:\nhostVethName %s, contVethMac %s, podIP %s, podConfig %#v\n %s", hostVeth.Attrs().Name, contVethMac, podIP.String(), podConfig, getScriptError(out))
} else if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -368,7 +373,8 @@ func (m *podManager) update(req *cniserver.PodRequest) error {
return err
}

out, err := exec.Command(sdnScript, updateCmd, hostVethName, contVethMac, podIP, podConfig.vnid, podConfig.ingressBandwidth, podConfig.egressBandwidth).CombinedOutput()
vnidStr := vnidToString(podConfig.vnid)
out, err := exec.Command(sdnScript, updateCmd, hostVethName, contVethMac, podIP, vnidStr, podConfig.ingressBandwidth, podConfig.egressBandwidth).CombinedOutput()
glog.V(5).Infof("UpdatePod network plugin output: %s, %v", string(out), err)

if isScriptError(err) {
Expand Down