vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ocicni: Factorize the pod netns setting routine

Browse source 
We are going to need to call it from both synchronous
and asynchronous code paths, in order to be able to wait for the
CNI networking configuration files before setting a pod networking
namespace up.

Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
This commit is contained in:
Samuel Ortiz 2017-03-21 11:47:05 +01:00
parent 98d2fab27b
commit 1665042800
1 changed files with 12 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

13
pkg/ocicni/ocicni.go
View file

@ -174,7 +174,9 @@ func (plugin *cniNetworkPlugin) Name() string {
return CNIPluginName return CNIPluginName
} }
func (plugin *cniNetworkPlugin) SetUpPod(netnsPath string, namespace string, name string, id string) error { func (plugin *cniNetworkPlugin) setUpPod(netnsPath string, namespace string, name string, id string) error {
plugin.syncNetworkConfig()
if err := plugin.checkInitialized(); err != nil { if err := plugin.checkInitialized(); err != nil {
return err return err
} }
@ -192,6 +194,15 @@ func (plugin *cniNetworkPlugin) SetUpPod(netnsPath string, namespace string, nam
} }
return err return err
}
func (plugin *cniNetworkPlugin) SetUpPod(netnsPath string, namespace string, name string, id string) error {
if err := plugin.checkInitialized(); err != nil {
return err
}
return plugin.setUpPod(netnsPath, namespace, name, id)
} }
func (plugin *cniNetworkPlugin) TearDownPod(netnsPath string, namespace string, name string, id string) error { func (plugin *cniNetworkPlugin) TearDownPod(netnsPath string, namespace string, name string, id string) error {