test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-02 11:47:36 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[REV] replace node with LabelKeyNodeSelector and replace service with LabelKeyServiceType

Browse Source
This commit is contained in:
GLYASAI 2018-12-04 15:59:58 +08:00
parent bf00ad8986
commit 1e3c3a2a3e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
api/handler/service.go
View File

@ -217,11 +217,11 @@ func (s *ServiceAction) AddLabel(l *api_model.LabelsStruct, serviceID string) er
for _, label := range l.Labels {
var labelModel dbmodel.TenantServiceLable
switch label.LabelKey {
case "service":
case core_model.LabelKeyServiceType:
labelModel.ServiceID = serviceID
labelModel.LabelKey = core_model.LabelKeyServiceType
labelModel.LabelValue = chekeServiceLabel(label.LabelValue)
case "node":
case core_model.LabelKeyNodeSelector:
labelModel.ServiceID = serviceID
labelModel.LabelKey = label.LabelValue
labelModel.LabelValue = core_model.LabelKeyNodeSelector
@ -249,7 +249,7 @@ func (s *ServiceAction) UpdateLabel(l *api_model.LabelsStruct, serviceID string)
// delete old labels
var err error
switch label.LabelKey {
case "node":
case core_model.LabelKeyNodeSelector:
err = db.GetManager().TenantServiceLabelDaoTransactions(tx).
DelTenantServiceLabelsByLabelValuesAndServiceID(serviceID)
default:
@ -264,11 +264,11 @@ func (s *ServiceAction) UpdateLabel(l *api_model.LabelsStruct, serviceID string)
// add new labels
var labelModel dbmodel.TenantServiceLable
switch label.LabelKey {
case "service":
case core_model.LabelKeyServiceType:
labelModel.ServiceID = serviceID
labelModel.LabelKey = core_model.LabelKeyServiceType
labelModel.LabelValue = chekeServiceLabel(label.LabelValue)
case "node":
case core_model.LabelKeyNodeSelector:
labelModel.ServiceID = serviceID
labelModel.LabelKey = label.LabelValue
labelModel.LabelValue = core_model.LabelKeyNodeSelector
@ -297,7 +297,7 @@ func (s *ServiceAction) DeleteLabel(l *api_model.LabelsStruct, serviceID string)
var err error
for _, label := range l.Labels {
switch label.LabelKey {
case "node":
case core_model.LabelKeyNodeSelector:
err = db.GetManager().TenantServiceLabelDaoTransactions(tx).
DelTenantServiceLabelByLabelValueAndServiceID(serviceID, label.LabelValue)
default: