scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19890 from vishh/0-nodes

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-01 14:09:06 -08:00
parent 7e158006c0 21748701f1
commit feb4b4857c
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/kubelet.go
View File

@@ -2137,9 +2137,7 @@ func hasHostPortConflicts(pods []*api.Pod) bool {
return false return false
} }
// hasInsufficientfFreeResources detects pods that exceeds node's resources. // hasInsufficientfFreeResources detects pods that exceeds node's cpu and memory resource.
// TODO: Consider integrate disk space into this function, and returns a
// suitable reason and message per resource type.
func (kl *Kubelet) hasInsufficientfFreeResources(pods []*api.Pod) (bool, bool) { func (kl *Kubelet) hasInsufficientfFreeResources(pods []*api.Pod) (bool, bool) {
info, err := kl.GetCachedMachineInfo() info, err := kl.GetCachedMachineInfo()
if err != nil { if err != nil {

4
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@@ -273,8 +273,8 @@ func CheckPodsExceedingFreeResources(pods []*api.Pod, allocatable api.ResourceLi
memoryRequested := int64(0) memoryRequested := int64(0)
for _, pod := range pods { for _, pod := range pods {
podRequest := getResourceRequest(pod) podRequest := getResourceRequest(pod)
fitsCPU := totalMilliCPU == 0 || (totalMilliCPU-milliCPURequested) >= podRequest.milliCPU fitsCPU := (totalMilliCPU - milliCPURequested) >= podRequest.milliCPU
fitsMemory := totalMemory == 0 || (totalMemory-memoryRequested) >= podRequest.memory fitsMemory := (totalMemory - memoryRequested) >= podRequest.memory
if !fitsCPU { if !fitsCPU {
// the pod doesn't fit due to CPU request // the pod doesn't fit due to CPU request
notFittingCPU = append(notFittingCPU, pod) notFittingCPU = append(notFittingCPU, pod)