Merge pull request #135 from yanxuean/myfeature

The parameters of InitCNI should be filled in reverse order
This commit is contained in:
Lantao Liu
2017-08-16 19:50:22 -07:00
committed by GitHub
2 changed files with 3 additions and 3 deletions

View File

@@ -136,7 +136,7 @@ func NewCRIContainerdService(containerdEndpoint, rootDir, networkPluginBinDir, n
client: client,
}
netPlugin, err := ocicni.InitCNI(networkPluginBinDir, networkPluginConfDir)
netPlugin, err := ocicni.InitCNI(networkPluginConfDir, networkPluginBinDir)
if err != nil {
return nil, fmt.Errorf("failed to initialize cni plugin: %v", err)
}