Resolve conflicts.

Signed-off-by: Ye Cao <[email protected]>
fluid-cloudnative · Jan 2, 2024 · 9337d8b · 9337d8b
1 parent a327e5d
commit 9337d8b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/pkg/common/vineyard.go b/pkg/common/vineyard.go
@@ -15,6 +15,8 @@ const (
 	DefaultVineyardWorkerImage = "vineyardcloudnative/vineyardd:latest"
 
 	DefultVineyardFuseImage = "vineyardcloudnative/mount-vineyard-socket:latest"
+
+	VineyardEngineImpl = VineyardRuntime
 )
 
 var (

diff --git a/pkg/ddc/factory.go b/pkg/ddc/factory.go
@@ -48,6 +48,7 @@ func init() {
 		common.JuiceFSEngineImpl:    juicefs.Build,
 		common.ThinEngineImpl:       thin.Build,
 		common.EFCEngineImpl:        efc.Build,
+		common.VineyardEngineImpl:   vineyard.Build,
 	}
 
 	deploy.SetPrecheckFunc(map[string]deploy.CheckFunc{