From 3a5db31e6c3c8d32a32f87389c65284f5c867cf3 Mon Sep 17 00:00:00 2001 From: Weidong Sun Date: Mon, 24 Mar 2025 17:52:03 +0800 Subject: [PATCH] fix: empty default snapshotter config for containerd namesapce default snapshotter label Signed-off-by: Weidong Sun --- cmd/nerdctl/main_test.go | 3 +-- pkg/config/config.go | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cmd/nerdctl/main_test.go b/cmd/nerdctl/main_test.go index bcd84434556..4dd4937da89 100644 --- a/cmd/nerdctl/main_test.go +++ b/cmd/nerdctl/main_test.go @@ -20,7 +20,6 @@ import ( "errors" "testing" - "github.com/containerd/containerd/v2/defaults" "github.com/containerd/nerdctl/mod/tigron/expect" "github.com/containerd/nerdctl/mod/tigron/require" "github.com/containerd/nerdctl/mod/tigron/test" @@ -91,7 +90,7 @@ func TestNerdctlConfig(t *testing.T) { { Description: "Default", Command: test.Command("info", "-f", "{{.Driver}}"), - Expected: test.Expects(0, nil, expect.Equals(defaults.DefaultSnapshotter+"\n")), + Expected: test.Expects(0, nil, expect.Equals(""+"\n")), }, { Description: "TOML > Default", diff --git a/pkg/config/config.go b/pkg/config/config.go index 1666ab61a0e..875bf2d178c 100644 --- a/pkg/config/config.go +++ b/pkg/config/config.go @@ -51,7 +51,7 @@ func New() *Config { DebugFull: false, Address: defaults.DefaultAddress, Namespace: namespaces.Default, - Snapshotter: defaults.DefaultSnapshotter, + Snapshotter: "", CNIPath: ncdefaults.CNIPath(), CNINetConfPath: ncdefaults.CNINetConfPath(), DataRoot: ncdefaults.DataRoot(),