Skip to content

Commit 4fcf05b

Browse files
committed
koordlet: make elements order consistent in NodeResourceTopology's annotations
Signed-off-by: Wang Xiaoqiang <wangxiaoqiang@qiyi.com>
1 parent a68cefe commit 4fcf05b

File tree

1 file changed

+6
-0
lines changed

1 file changed

+6
-0
lines changed

pkg/koordlet/statesinformer/states_noderesourcetopology.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -390,6 +390,9 @@ func (s *nodeTopoInformer) calGuaranteedCpu(usedCPUs map[int32]*extension.CPUInf
390390
delete(usedCPUs, int32(cpuID))
391391
}
392392
}
393+
sort.Slice(podAllocs, func(i, j int) bool {
394+
return string(podAllocs[i].UID) < string(podAllocs[j].UID)
395+
})
393396
return podAllocs, nil
394397
}
395398

@@ -574,6 +577,9 @@ func (s *nodeTopoInformer) calCPUTopology() (*metriccache.NodeCPUInfo, *extensio
574577
cpuTopology.Detail = append(cpuTopology.Detail, info)
575578
cpus[cpu.CPUID] = &info
576579
}
580+
sort.Slice(cpuTopology.Detail, func(i, j int) bool {
581+
return cpuTopology.Detail[i].ID < cpuTopology.Detail[j].ID
582+
})
577583
return nodeCPUInfo, cpuTopology, cpus, nil
578584
}
579585

0 commit comments

Comments
 (0)