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

network/cni: Always setup 'lo'

Browse Source 
See issue #28561
This commit is contained in:
Euan Kemp 2016-07-11 17:08:33 -07:00
parent e06197d478
commit 8f7b5bcfd3
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/kubelet/network/cni/cni.go
View File

@ -39,6 +39,7 @@ const (
type cniNetworkPlugin struct { type cniNetworkPlugin struct {
network.NoopNetworkPlugin network.NoopNetworkPlugin
loNetwork *cniNetwork
defaultNetwork *cniNetwork defaultNetwork *cniNetwork
host network.Host host network.Host
execer utilexec.Interface execer utilexec.Interface
@ -104,6 +105,23 @@ func (plugin *cniNetworkPlugin) Init(host network.Host, hairpinMode componentcon
return err return err
} }
loConfig, err := libcni.ConfFromBytes([]byte(`{
"cniVersion": "0.1.0",
"name": "cni-loopback",
"type": "loopback"
}`))
if err != nil {
return err
}
cninet := &libcni.CNIConfig{
Path: []string{DefaultCNIDir},
}
plugin.loNetwork = &cniNetwork{
name: "lo",
NetworkConfig: loConfig,
CNIConfig: cninet,
}
plugin.host = host plugin.host = host
return nil return nil
} }
@ -118,6 +136,12 @@ func (plugin *cniNetworkPlugin) SetUpPod(namespace string, name string, id kubec
return fmt.Errorf("CNI failed to retrieve network namespace path: %v", err) return fmt.Errorf("CNI failed to retrieve network namespace path: %v", err)
} }
_, err = plugin.loNetwork.addToNetwork(name, namespace, id, netnsPath)
if err != nil {
glog.Errorf("Error while adding to cni lo network: %s", err)
return err
}
_, err = plugin.defaultNetwork.addToNetwork(name, namespace, id, netnsPath) _, err = plugin.defaultNetwork.addToNetwork(name, namespace, id, netnsPath)
if err != nil { if err != nil {
glog.Errorf("Error while adding to cni network: %s", err) glog.Errorf("Error while adding to cni network: %s", err)