From e1b49586633c4ad2a78ff91abc10a92d7bbdae7d Mon Sep 17 00:00:00 2001 From: Abel Feng Date: Mon, 20 Nov 2023 22:24:38 +0800 Subject: [PATCH] sandbox: keep rootDir and stateDir compatible Signed-off-by: Abel Feng --- pkg/cri/server/base/cri_base.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/cri/server/base/cri_base.go b/pkg/cri/server/base/cri_base.go index dc897e071..09e9de899 100644 --- a/pkg/cri/server/base/cri_base.go +++ b/pkg/cri/server/base/cri_base.go @@ -93,12 +93,17 @@ func initCRIBase(ic *plugin.InitContext) (interface{}, error) { } } + // For backward compatibility, we have to keep the rootDir and stateDir the same as before. + containerdRootDir := filepath.Dir(ic.Properties[plugins.PropertyRootDir]) + rootDir := filepath.Join(containerdRootDir, "io.containerd.grpc.v1.cri") + containerdStateDir := filepath.Dir(ic.Properties[plugins.PropertyStateDir]) + stateDir := filepath.Join(containerdStateDir, "io.containerd.grpc.v1.cri") c := criconfig.Config{ PluginConfig: *pluginConfig, - ContainerdRootDir: filepath.Dir(ic.Properties[plugins.PropertyRootDir]), + ContainerdRootDir: containerdRootDir, ContainerdEndpoint: ic.Properties[plugins.PropertyGRPCAddress], - RootDir: ic.Properties[plugins.PropertyRootDir], - StateDir: ic.Properties[plugins.PropertyStateDir], + RootDir: rootDir, + StateDir: stateDir, } log.G(ctx).Infof("Start cri plugin with config %+v", c)