From ef5b9d1e1677f45604caf22893d66dbdb4dbdb9e Mon Sep 17 00:00:00 2001 From: Lantao Liu Date: Fri, 2 Mar 2018 19:41:20 +0000 Subject: [PATCH] Only overwrite when legacy options are specified. Signed-off-by: Lantao Liu --- cmd/cri-containerd/options/options.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/cmd/cri-containerd/options/options.go b/cmd/cri-containerd/options/options.go index 4a965c07e..3f1edfecb 100644 --- a/cmd/cri-containerd/options/options.go +++ b/cmd/cri-containerd/options/options.go @@ -204,8 +204,12 @@ func (c *CRIContainerdOptions) InitFlags(fs *pflag.FlagSet) error { } // Add this for backward compatibility. // TODO(random-liu): Remove this when we no longer support cri-containerd standalone mode. - c.ContainerdRootDir = c.ContainerdConfig.RootDir - c.ContainerdEndpoint = c.ContainerdConfig.Endpoint + if c.ContainerdConfig.RootDir != "" { + c.ContainerdRootDir = c.ContainerdConfig.RootDir + } + if c.ContainerdConfig.Endpoint != "" { + c.ContainerdEndpoint = c.ContainerdConfig.Endpoint + } // What is the reason for applying the command line twice? // Because the values from command line have the highest priority.