github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97917 from gavinfish/refact-addpod

Browse Source 
Scheduler: Add function AddPodInfo(*PodInfo) for NodeInfo struct
This commit is contained in:
Kubernetes Prow Robot 2021-01-16 00:25:43 -08:00 committed by GitHub
commit c37905c06c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/scheduler/framework/types.go
View File

@ -513,10 +513,10 @@ func (n *NodeInfo) String() string {
podKeys, n.Requested, n.NonZeroRequested, n.UsedPorts, n.Allocatable) podKeys, n.Requested, n.NonZeroRequested, n.UsedPorts, n.Allocatable)
} }
// AddPod adds pod information to this NodeInfo. // AddPodInfo adds pod information to this NodeInfo.
func (n *NodeInfo) AddPod(pod *v1.Pod) { // Consider using this instead of AddPod if a PodInfo is already computed.
podInfo := NewPodInfo(pod) func (n *NodeInfo) AddPodInfo(podInfo *PodInfo) {
res, non0CPU, non0Mem := calculateResource(pod) res, non0CPU, non0Mem := calculateResource(podInfo.Pod)
n.Requested.MilliCPU += res.MilliCPU n.Requested.MilliCPU += res.MilliCPU
n.Requested.Memory += res.Memory n.Requested.Memory += res.Memory
n.Requested.EphemeralStorage += res.EphemeralStorage n.Requested.EphemeralStorage += res.EphemeralStorage
@ -529,10 +529,10 @@ func (n *NodeInfo) AddPod(pod *v1.Pod) {
n.NonZeroRequested.MilliCPU += non0CPU n.NonZeroRequested.MilliCPU += non0CPU
n.NonZeroRequested.Memory += non0Mem n.NonZeroRequested.Memory += non0Mem
n.Pods = append(n.Pods, podInfo) n.Pods = append(n.Pods, podInfo)
if podWithAffinity(pod) { if podWithAffinity(podInfo.Pod) {
n.PodsWithAffinity = append(n.PodsWithAffinity, podInfo) n.PodsWithAffinity = append(n.PodsWithAffinity, podInfo)
} }
if podWithRequiredAntiAffinity(pod) { if podWithRequiredAntiAffinity(podInfo.Pod) {
n.PodsWithRequiredAntiAffinity = append(n.PodsWithRequiredAntiAffinity, podInfo) n.PodsWithRequiredAntiAffinity = append(n.PodsWithRequiredAntiAffinity, podInfo)
} }
@ -542,6 +542,11 @@ func (n *NodeInfo) AddPod(pod *v1.Pod) {
n.Generation = nextGeneration() n.Generation = nextGeneration()
} }
// AddPod is a wrapper around AddPodInfo.
func (n *NodeInfo) AddPod(pod *v1.Pod) {
n.AddPodInfo(NewPodInfo(pod))
}
func podWithAffinity(p *v1.Pod) bool { func podWithAffinity(p *v1.Pod) bool {
affinity := p.Spec.Affinity affinity := p.Spec.Affinity
return affinity != nil && (affinity.PodAffinity != nil || affinity.PodAntiAffinity != nil) return affinity != nil && (affinity.PodAffinity != nil || affinity.PodAntiAffinity != nil)