opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1288 from Zexi/bugfix/scheduler-share-network-typo

Browse Source 
scheduler: fix shared projects network filtered
This commit is contained in:
yunion-ci-robot
2019-06-18 22:28:04 +08:00
committed by GitHub
parent a40e8dcccb dc6a9b5237
commit 1111691561
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go
+2 -2
View File
@@ -99,8 +99,8 @@ func (p *NetworkSchedtagPredicate) IsResourceFitInput(u *core.Unit, _ core.Candi
if network.IsPublic {
return fmt.Errorf("Network %s is public", network.Name)
}
if network.ProjectId != schedData.Project && utils.IsInStringArray(schedData.Project, network.GetSharedProjects()) {
return fmt.Errorf("Network project %s not owner by %s", network.ProjectId, schedData.Project)
if network.ProjectId != schedData.Project && !utils.IsInStringArray(schedData.Project, network.GetSharedProjects()) {
return fmt.Errorf("Network project %s + %v not owner by %s", network.ProjectId, network.GetSharedProjects(), schedData.Project)
}
} else {
if !network.IsPublic {