Merge pull request dragonflyoss#494 from yawqi/master

nydusify: bug fix, `check` subcommand uses direct mode
yawqi · Jun 15, 2022 · 3d3ac61 · 3d3ac61
2 parents 4cc8fe1 + 3433c4c
commit 3d3ac61
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 9 deletions.
diff --git a/contrib/nydusify/pkg/checker/checker.go b/contrib/nydusify/pkg/checker/checker.go
@@ -32,7 +32,6 @@ type Opt struct {
 	BackendType    string
 	BackendConfig  string
 	ExpectedArch   string
-	FsVersion      string
 }
 
 // Checker validates Nydus image manifest, bootstrap and mounts filesystem
@@ -106,13 +105,8 @@ func (checker *Checker) Check(ctx context.Context) error {
 		return errors.Wrap(err, "output image information")
 	}
 
-	mode := "cached"
-	digestValidate := true
-	if checker.FsVersion == "6" {
-		mode = "direct"
-		digestValidate = false
-
-	}
+	mode := "direct"
+	digestValidate := false
 
 	rules := []rule.Rule{
 		&rule.ManifestRule{

diff --git a/contrib/nydusify/tests/nydusify.go b/contrib/nydusify/tests/nydusify.go
@@ -157,7 +157,6 @@ func (nydusify *Nydusify) Check(t *testing.T) {
 		BackendType:    nydusify.backendType,
 		BackendConfig:  nydusify.backendConfig,
 		ExpectedArch:   "amd64",
-		FsVersion:      nydusify.fsVersion,
 	})
 	assert.Nil(t, err)