From 1665042800de22202a516832952c18184ff36cf0 Mon Sep 17 00:00:00 2001 From: Samuel Ortiz Date: Tue, 21 Mar 2017 11:47:05 +0100 Subject: [PATCH] ocicni: Factorize the pod netns setting routine 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 --- pkg/ocicni/ocicni.go | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkg/ocicni/ocicni.go b/pkg/ocicni/ocicni.go index e7c1bf75..6ed1d0c6 100644 --- a/pkg/ocicni/ocicni.go +++ b/pkg/ocicni/ocicni.go @@ -174,7 +174,9 @@ func (plugin *cniNetworkPlugin) Name() string { 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 { return err } @@ -192,6 +194,15 @@ func (plugin *cniNetworkPlugin) SetUpPod(netnsPath string, namespace string, nam } 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 {