test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-01 19:28:05 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #736 from GLYASAI/V5.2

Browse Source 
use nas as nfs
This commit is contained in:
黄润豪 2020-04-14 13:58:26 +08:00 committed by GitHub
commit 347cc20de8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
worker/master/volumes/provider/rainbondsssc.go
View File

@ -25,10 +25,8 @@ import (
"strconv"
"strings"
"github.com/goodrain/rainbond/db"
"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/db"
"github.com/goodrain/rainbond/util"
"github.com/goodrain/rainbond/worker/master/volumes/provider/lib/controller"
v1 "k8s.io/api/core/v1"
@ -156,10 +154,13 @@ func updatePathForPersistentVolumeSource(persistentVolumeSource *v1.PersistentVo
case persistentVolumeSource.NFS != nil:
source.NFS = persistentVolumeSource.NFS
source.NFS.Path = newPath(persistentVolumeSource.NFS.Path)
case persistentVolumeSource.CSI != nil:
case persistentVolumeSource.CSI != nil && persistentVolumeSource.CSI.Driver == "nasplugin.csi.alibabacloud.com":
// convert aliyun nas to nfs
if persistentVolumeSource.CSI.VolumeAttributes != nil {
source.CSI = persistentVolumeSource.CSI
source.CSI.VolumeAttributes["path"] = newPath(persistentVolumeSource.CSI.VolumeAttributes["path"])
source.NFS = &v1.NFSVolumeSource{
Server: persistentVolumeSource.CSI.VolumeAttributes["server"],
Path: newPath(persistentVolumeSource.CSI.VolumeAttributes["path"]),
}
}
case persistentVolumeSource.Glusterfs != nil:
//glusterfs:
@ -170,5 +171,5 @@ func updatePathForPersistentVolumeSource(persistentVolumeSource *v1.PersistentVo
default:
return nil, fmt.Errorf("unsupported persistence volume source")
}
return persistentVolumeSource, nil
return source, nil
}