karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adopt zones in scheduler spread by constraints 

Signed-off-by: Tanggui Bian <softwarebtg@163.com>
This commit is contained in:
Tanggui Bian 2023-08-25 15:27:49 +08:00
parent fb4c16d348
commit 10b5ff2036
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkg/scheduler/core/spreadconstraint/group_clusters.go
View File

@ -136,11 +136,12 @@ func (info *GroupClustersInfo) generateZoneInfo(spreadConstraints []policyv1alph
} }
for _, clusterInfo := range info.Clusters { for _, clusterInfo := range info.Clusters {
zone := clusterInfo.Cluster.Spec.Zone zones := clusterInfo.Cluster.Spec.Zones
if zone == "" { if len(zones) == 0 {
continue continue
} }
for _, zone := range zones {
zoneInfo, ok := info.Zones[zone] zoneInfo, ok := info.Zones[zone]
if !ok { if !ok {
zoneInfo = ZoneInfo{ zoneInfo = ZoneInfo{
@ -148,11 +149,11 @@ func (info *GroupClustersInfo) generateZoneInfo(spreadConstraints []policyv1alph
Clusters: make([]ClusterDetailInfo, 0), Clusters: make([]ClusterDetailInfo, 0),
} }
} }
zoneInfo.Clusters = append(zoneInfo.Clusters, clusterInfo) zoneInfo.Clusters = append(zoneInfo.Clusters, clusterInfo)
zoneInfo.AvailableReplicas += clusterInfo.AvailableReplicas zoneInfo.AvailableReplicas += clusterInfo.AvailableReplicas
info.Zones[zone] = zoneInfo info.Zones[zone] = zoneInfo
} }
}
for zone, zoneInfo := range info.Zones { for zone, zoneInfo := range info.Zones {
zoneInfo.Score = zoneInfo.Clusters[0].Score zoneInfo.Score = zoneInfo.Clusters[0].Score

2
pkg/scheduler/core/spreadconstraint/select_clusters_test.go
View File

@ -18,7 +18,7 @@ func NewClusterWithTopology(name, provider, region, zone string) *clusterv1alpha
Spec: clusterv1alpha1.ClusterSpec{ Spec: clusterv1alpha1.ClusterSpec{
Provider: provider, Provider: provider,
Region: region, Region: region,
Zone: zone, Zones: []string{zone},
}, },
} }
} }