fix dataload (fluid-cloudnative#1806)

Signed-off-by: frankleaf <[email protected]>
allenhaozi · May 2, 2022 · 4a904ba · 4a904ba
1 parent 316ecd9
commit 4a904ba
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/pkg/ddc/jindo/const.go b/pkg/ddc/jindo/const.go
@@ -50,5 +50,5 @@ const (
 
 	JINDO_FUSE_MONNTPATH = "/jfs/jindofs-fuse"
 
-	DEFAULT_JINDO_RUNTIME_IMAGE = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:4.3.0"
+	DEFAULT_JINDO_RUNTIME_IMAGE = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:3.8.0"
 )
diff --git a/pkg/ddc/jindofsx/const.go b/pkg/ddc/jindofsx/const.go
@@ -55,4 +55,6 @@ const (
 	JINDO_FUSE_MONNTPATH = "/jfs/jindofs-fuse"
 
 	DEFAULT_JINDOFSX_RUNTIME_IMAGE = "registry.cn-shanghai.aliyuncs.com/jindofs/smartdata:4.3.0"
+
+	ENGINE_TYPE = "jindofsx"
 )
diff --git a/pkg/ddc/jindofsx/load_data.go b/pkg/ddc/jindofsx/load_data.go
@@ -25,7 +25,7 @@ import (
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/common"
 	cdataload "github.com/fluid-cloudnative/fluid/pkg/dataload"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindo/operations"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindofsx/operations"
 	cruntime "github.com/fluid-cloudnative/fluid/pkg/runtime"
 	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	"github.com/fluid-cloudnative/fluid/pkg/utils/docker"
@@ -56,7 +56,7 @@ func (e *JindoFSxEngine) CreateDataLoadJob(ctx cruntime.ReconcileRequestContext,
 			log.Error(err, "failed to generate dataload chart's value file")
 			return err
 		}
-		chartName := utils.GetChartsDirectory() + "/" + cdataload.DATALOAD_CHART + "/" + common.JindoRuntime
+		chartName := utils.GetChartsDirectory() + "/" + cdataload.DATALOAD_CHART + "/" + ENGINE_TYPE
 		err = helm.InstallRelease(releaseName, targetDataload.Namespace, valueFileName, chartName)
 		if err != nil {
 			log.Error(err, "failed to install dataload chart")

diff --git a/pkg/ddc/jindofsx/utils.go b/pkg/ddc/jindofsx/utils.go
@@ -23,7 +23,7 @@ import (
 
 	datav1alpha1 "github.com/fluid-cloudnative/fluid/api/v1alpha1"
 	"github.com/fluid-cloudnative/fluid/pkg/common"
-	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindo/operations"
+	"github.com/fluid-cloudnative/fluid/pkg/ddc/jindofsx/operations"
 	"github.com/fluid-cloudnative/fluid/pkg/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	"k8s.io/apimachinery/pkg/types"