github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-13 07:04:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2564 from Bevisy/main-2296

Browse Source 
virtcontainers: Remove NewStoreFeature
This commit is contained in:
Bin Liu 2021-09-03 10:41:21 +08:00 committed by GitHub
commit 103fdd3f6c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/virtcontainers/persist/manager.go
View File

@ -9,7 +9,6 @@ package persist
import ( import (
"fmt" "fmt"
exp "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/experimental"
persistapi "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/persist/api" 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/persist/fs"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/pkg/rootless"
@ -23,12 +22,6 @@ const (
) )
var ( 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 expErr error
supportedDrivers = map[string]initFunc{ supportedDrivers = map[string]initFunc{
@ -38,10 +31,6 @@ var (
mockTesting = false mockTesting = false
) )
func init() {
expErr = exp.Register(NewStoreFeature)
}
func EnableMockTesting() { func EnableMockTesting() {
mockTesting = true mockTesting = true
} }

4
src/runtime/virtcontainers/persist_test.go
View File

@ -13,7 +13,6 @@ import (
"github.com/stretchr/testify/assert" "github.com/stretchr/testify/assert"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/device/manager" "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/persist"
"github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types" "github.com/kata-containers/kata-containers/src/runtime/virtcontainers/types"
) )
@ -22,8 +21,7 @@ func TestSandboxRestore(t *testing.T) {
var err error var err error
assert := assert.New(t) assert := assert.New(t)
sconfig := SandboxConfig{ sconfig := SandboxConfig{
ID: "test-exp", ID: "test-exp",
Experimental: []exp.Feature{persist.NewStoreFeature},
} }
container := make(map[string]*Container) container := make(map[string]*Container)
container["test-exp"] = &Container{} container["test-exp"] = &Container{}