From e2a9e78c9e638307cc79db0e536e4a2552e6b66f Mon Sep 17 00:00:00 2001 From: Binbin Zhang Date: Thu, 2 Sep 2021 21:28:36 +0800 Subject: [PATCH] virtcontainers: Remove NewStoreFeature remove NewStoreFeature Fixes: #2296 Signed-off-by: Binbin Zhang --- src/runtime/virtcontainers/persist/manager.go | 11 ----------- src/runtime/virtcontainers/persist_test.go | 4 +--- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/src/runtime/virtcontainers/persist/manager.go b/src/runtime/virtcontainers/persist/manager.go index 650c4926d3..a104bdcabf 100644 --- a/src/runtime/virtcontainers/persist/manager.go +++ b/src/runtime/virtcontainers/persist/manager.go @@ -9,7 +9,6 @@ package persist import ( "fmt" - exp "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/experimental" persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/fs" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" @@ -23,12 +22,6 @@ const ( ) var ( - // NewStoreFeature is an experimental feature - NewStoreFeature = exp.Feature{ - Name: "newstore", - Description: "This is a new storage driver which reorganized disk data structures, it has to be an experimental feature since it breaks backward compatibility.", - ExpRelease: "2.0", - } expErr error supportedDrivers = map[string]initFunc{ @@ -38,10 +31,6 @@ var ( mockTesting = false ) -func init() { - expErr = exp.Register(NewStoreFeature) -} - func EnableMockTesting() { mockTesting = true } diff --git a/src/runtime/virtcontainers/persist_test.go b/src/runtime/virtcontainers/persist_test.go index a4743fe4f5..019435ae5c 100644 --- a/src/runtime/virtcontainers/persist_test.go +++ b/src/runtime/virtcontainers/persist_test.go @@ -13,7 +13,6 @@ import ( "github.com/stretchr/testify/assert" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/manager" - exp "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/experimental" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" ) @@ -22,8 +21,7 @@ func TestSandboxRestore(t *testing.T) { var err error assert := assert.New(t) sconfig := SandboxConfig{ - ID: "test-exp", - Experimental: []exp.Feature{persist.NewStoreFeature}, + ID: "test-exp", } container := make(map[string]*Container) container["test-exp"] = &Container{}