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

Merge pull request #88876 from nolancon/none-policy-fix

Browse Source 
Topology Manager none policy bug fix
This commit is contained in:
Kubernetes Prow Robot 2020-03-05 21:40:33 -08:00 committed by GitHub
commit cd0057c16a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/cm/topologymanager/topology_manager.go
View File

@ -230,15 +230,22 @@ func (m *manager) RemoveContainer(containerID string) error {
} }
func (m *manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitResult { func (m *manager) Admit(attrs *lifecycle.PodAdmitAttributes) lifecycle.PodAdmitResult {
// Unconditionally admit the pod if we are running with the 'none' policy.
if m.policy.Name() == PolicyNone {
return lifecycle.PodAdmitResult{Admit: true}
}
klog.Infof("[topologymanager] Topology Admit Handler") klog.Infof("[topologymanager] Topology Admit Handler")
pod := attrs.Pod pod := attrs.Pod
for _, container := range append(pod.Spec.InitContainers, pod.Spec.Containers...) { for _, container := range append(pod.Spec.InitContainers, pod.Spec.Containers...) {
if m.policy.Name() == PolicyNone {
err := m.allocateAlignedResources(pod, &container)
if err != nil {
return lifecycle.PodAdmitResult{
Message: fmt.Sprintf("Allocate failed due to %v, which is unexpected", err),
Reason: "UnexpectedAdmissionError",
Admit: false,
}
}
continue
}
result, admit := m.calculateAffinity(pod, &container) result, admit := m.calculateAffinity(pod, &container)
if !admit { if !admit {
return lifecycle.PodAdmitResult{ return lifecycle.PodAdmitResult{