test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-03 04:07:51 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #600 from fanyangyang/feature/k8s/invalid_label

Browse Source 
remove invalid label
This commit is contained in:
barnettZQG 2019-12-26 06:24:58 -06:00 committed by GitHub
commit 7cf3edffc0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worker/appm/conversion/version.go
View File

@ -594,7 +594,6 @@ func (v *volumeDefine) SetPV(VolumeType dbmodel.VolumeType, name, volumeName, mo
Name: name,
Labels: v.as.GetCommonLabels(map[string]string{
"volume_name": volumeName,
"volume_path": mountPath,
}),
},
Spec: corev1.PersistentVolumeClaimSpec{
@ -633,7 +632,6 @@ func (v *volumeDefine) SetPV(VolumeType dbmodel.VolumeType, name, volumeName, mo
},
Labels: v.as.GetCommonLabels(map[string]string{
"volume_name": volumeName,
"volume_path": mountPath,
}),
},
Spec: corev1.PersistentVolumeClaimSpec{

10
worker/master/volumes/provider/rainbondsslc.go
View File

@ -22,21 +22,22 @@ import (
"bytes"
"encoding/json"
"fmt"
"github.com/goodrain/rainbond/db/dao"
"net/http"
"time"
"github.com/goodrain/rainbond/db"
"github.com/goodrain/rainbond/db/dao"
"github.com/goodrain/rainbond/node/nodem/client"
"github.com/goodrain/rainbond/worker/appm/store"
"github.com/goodrain/rainbond/worker/master/volumes/provider/lib/controller"
"k8s.io/client-go/kubernetes"
"github.com/Sirupsen/logrus"
"github.com/goodrain/rainbond/node/nodem/client"
httputil "github.com/goodrain/rainbond/util/http"
"github.com/goodrain/rainbond/worker/master/volumes/provider/lib/controller"
"k8s.io/api/core/v1"
v1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
)
@ -135,7 +136,6 @@ func (p *rainbondsslcProvisioner) createPath(options controller.VolumeOptions) (
"service_id": serviceID,
"pvcname": options.PVC.Name,
"volume_name": volume.VolumeName,
"volume_path": volume.VolumePath,
"pod_name": getPodNameByPVCName(options.PVC.Name),
}
var ip string