Merge pull request #2194 from YaoZengzeng/fix-cni

bugfix: remove useless noop cni manager and speak loudly if init cni manager failed

Author: fuweid

cri/ocicni/cni_manager.go

@@ -19,7 +19,7 @@ type CniManager struct {
 // NewCniManager initializes a brand new cni manager.
 // If initialize failed, return NoopCniManager, we should not make pouchd creashed
 // because of the failure of cni manager.
-func NewCniManager(cfg *config.Config) CniMgr {
+func NewCniManager(cfg *config.Config) (CniMgr, error) {
 	networkPluginBinDir := cfg.NetworkPluginBinDir
 	networkPluginConfDir := cfg.NetworkPluginConfDir
 
@@ -28,20 +28,18 @@ func NewCniManager(cfg *config.Config) CniMgr {
 	if err != nil && os.IsNotExist(err) {
 		err = os.MkdirAll(networkPluginConfDir, 0666)
 		if err != nil {
-			logrus.Errorf("failed to create configuration directory for CNI: %v", err)
-			return &NoopCniManager{}
+			return nil, err
 		}
 	}
 
 	plugin, err := ocicni.InitCNI(networkPluginConfDir, networkPluginBinDir)
 	if err != nil {
-		logrus.Errorf("failed to initialize cni manager: %v", err)
-		return &NoopCniManager{}
+		return nil, err
 	}
 
 	return &CniManager{
 		plugin: plugin,
-	}
+	}, nil
 }
 
 // Name returns the plugin's name. This will be used when searching

cri/ocicni/noop_cni_manager.go

@@ -129,12 +129,15 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
 	c := &CriManager{
 		ContainerMgr:   ctrMgr,
 		ImageMgr:       imgMgr,
-		CniMgr:         cni.NewCniManager(&config.CriConfig),
 		StreamServer:   streamServer,
 		SandboxBaseDir: path.Join(config.HomeDir, "sandboxes"),
 		SandboxImage:   config.CriConfig.SandboxImage,
 		SnapshotStore:  mgr.NewSnapshotStore(),
 	}
+	c.CniMgr, err = cni.NewCniManager(&config.CriConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create cni manager: %v", err)
+	}
 
 	c.SandboxStore, err = meta.NewStore(meta.Config{
 		Driver:  "local",

cri/v1alpha1/cri.go

@@ -135,12 +135,15 @@ func NewCriManager(config *config.Config, ctrMgr mgr.ContainerMgr, imgMgr mgr.Im
 		ContainerMgr:   ctrMgr,
 		ImageMgr:       imgMgr,
 		VolumeMgr:      volumeMgr,
-		CniMgr:         cni.NewCniManager(&config.CriConfig),
 		StreamServer:   streamServer,
 		SandboxBaseDir: path.Join(config.HomeDir, "sandboxes"),
 		SandboxImage:   config.CriConfig.SandboxImage,
 		SnapshotStore:  mgr.NewSnapshotStore(),
 	}
+	c.CniMgr, err = cni.NewCniManager(&config.CriConfig)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create cni manager: %v", err)
+	}
 
 	c.SandboxStore, err = meta.NewStore(meta.Config{
 		Driver:  "local",