From 8cc0347b0a751758d49fe2c951934f4d4f8e487b Mon Sep 17 00:00:00 2001 From: yanxuean Date: Wed, 16 Aug 2017 15:35:34 +0800 Subject: [PATCH] The parameters of InitCNI should be filled in reverse order. fix #131 Signed-off-by: yanxuean --- cmd/cri-containerd/options/options.go | 4 ++-- pkg/server/service.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/cri-containerd/options/options.go b/cmd/cri-containerd/options/options.go index edd196f97..e19d2b0ab 100644 --- a/cmd/cri-containerd/options/options.go +++ b/cmd/cri-containerd/options/options.go @@ -64,9 +64,9 @@ func (c *CRIContainerdOptions) AddFlags(fs *pflag.FlagSet) { fs.BoolVar(&c.PrintVersion, "version", false, "Print cri-containerd version information and quit.") fs.StringVar(&c.NetworkPluginBinDir, "network-bin-dir", - "/etc/cni/net.d", "The directory for putting network binaries.") + "/opt/cni/bin", "The directory for putting network binaries.") fs.StringVar(&c.NetworkPluginConfDir, "network-conf-dir", - "/opt/cni/bin", "The directory for putting network plugin configuration files.") + "/etc/cni/net.d", "The directory for putting network plugin configuration files.") fs.StringVar(&c.StreamServerAddress, "stream-addr", "", "The ip address streaming server is listening on. Default host interface is used if this is empty.") fs.StringVar(&c.StreamServerPort, "stream-port", diff --git a/pkg/server/service.go b/pkg/server/service.go index 3bf193cc7..df9d55ec3 100644 --- a/pkg/server/service.go +++ b/pkg/server/service.go @@ -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) }