Revert "fix: fix set volume without storage, set default volume type (#…

…4180)" (#4278) (#4279) This reverts commit 96a4fc2. Co-authored-by: sixther <[email protected]>
erda-project · Mar 4, 2022 · 6a73078 · 6a73078
1 parent a46217d
commit 6a73078
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/modules/orchestrator/scheduler/impl/servicegroup/servicegroup.go b/modules/orchestrator/scheduler/impl/servicegroup/servicegroup.go
@@ -438,11 +438,6 @@ func setServiceVolumes(clusterName string, service *diceyml.Service, clusterinfo
 		if v.Path != "" && v.TargetPath != "" && v.Path != v.TargetPath {
 			return []apistructs.Volume{}, errors.New("if path and taragetPath set in volume, they must same.")
 		}
-
-		if v.TargetPath == "" && v.Path != "" {
-			v.TargetPath = v.Path
-		}
-
 		// 卷映射的容器目录合法性检查
 		if v.TargetPath == "" || v.TargetPath == "/" {
 			return []apistructs.Volume{}, errors.New(fmt.Sprintf("invalid targetPath [%s]", v.TargetPath))

diff --git a/modules/orchestrator/services/deployment/deployment_context.go b/modules/orchestrator/services/deployment/deployment_context.go
@@ -1522,7 +1522,7 @@ func (fsm *DeployFSMContext) convertService(serviceName string, service *diceyml
 	oldTypeVolumes := make([]diceyml.Volume, 0)
 	newVolumes := make([]diceyml.Volume, 0)
 	for _, vol := range service.Volumes {
-		if vol.Path != "" {
+		if vol.Storage != "" {
 			oldTypeVolumes = append(oldTypeVolumes, vol)
 		} else {
 			newVolumes = append(newVolumes, vol)

diff --git a/pkg/k8s/storage/detect_sc.go b/pkg/k8s/storage/detect_sc.go
@@ -82,7 +82,7 @@ func VolumeTypeToSCName(diskType string, vendor string) (string, error) {
 			}
 	*/
 	case "":
-		return apistructs.DiceNFSVolumeSC, nil
+		return apistructs.DiceLocalVolumeSC, nil
 	//case apistructs.VolumeTypeOSS:
 	default:
 		return "", errors.New(fmt.Sprintf("unsupported disk type %s", diskType))

diff --git a/pkg/k8s/storage/detect_sc_test.go b/pkg/k8s/storage/detect_sc_test.go
@@ -37,7 +37,7 @@ func TestVolumeTypeToSCName(t *testing.T) {
 			args: args{
 				vendor: apistructs.CSIVendorAlibaba,
 			},
-			want:    apistructs.DiceNFSVolumeSC,
+			want:    apistructs.DiceLocalVolumeSC,
 			wantErr: false,
 		},
 		{