6dcec345df
Introduce a new `admission` subpackage to factor out the responsability to create `PodAdmitResult` objects. This enables resource manager to report specific errors in Allocate() and to bubble up them in the relevant fields of the `PodAdmitResult`. To demonstrate the approach we refactor TopologyAffinityError as a proper error. Co-authored-by: Kevin Klues <kklues@nvidia.com> Co-authored-by: Swati Sehgal <swsehgal@redhat.com> Signed-off-by: Francesco Romani <fromani@redhat.com>
88 lines
2.8 KiB
Go
88 lines
2.8 KiB
Go
/*
|
|
Copyright 2020 The Kubernetes Authors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package topologymanager
|
|
|
|
import (
|
|
"k8s.io/api/core/v1"
|
|
"k8s.io/klog/v2"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/admission"
|
|
"k8s.io/kubernetes/pkg/kubelet/cm/containermap"
|
|
"k8s.io/kubernetes/pkg/kubelet/lifecycle"
|
|
)
|
|
|
|
type containerScope struct {
|
|
scope
|
|
}
|
|
|
|
// Ensure containerScope implements Scope interface
|
|
var _ Scope = &containerScope{}
|
|
|
|
// NewContainerScope returns a container scope.
|
|
func NewContainerScope(policy Policy) Scope {
|
|
return &containerScope{
|
|
scope{
|
|
name: containerTopologyScope,
|
|
podTopologyHints: podTopologyHints{},
|
|
policy: policy,
|
|
podMap: containermap.NewContainerMap(),
|
|
},
|
|
}
|
|
}
|
|
|
|
func (s *containerScope) Admit(pod *v1.Pod) lifecycle.PodAdmitResult {
|
|
// Exception - Policy : none
|
|
if s.policy.Name() == PolicyNone {
|
|
return s.admitPolicyNone(pod)
|
|
}
|
|
|
|
for _, container := range append(pod.Spec.InitContainers, pod.Spec.Containers...) {
|
|
bestHint, admit := s.calculateAffinity(pod, &container)
|
|
klog.InfoS("Best TopologyHint", "bestHint", bestHint, "pod", klog.KObj(pod), "containerName", container.Name)
|
|
|
|
if !admit {
|
|
return admission.GetPodAdmitResult(&TopologyAffinityError{})
|
|
}
|
|
klog.InfoS("Topology Affinity", "bestHint", bestHint, "pod", klog.KObj(pod), "containerName", container.Name)
|
|
s.setTopologyHints(string(pod.UID), container.Name, bestHint)
|
|
|
|
err := s.allocateAlignedResources(pod, &container)
|
|
if err != nil {
|
|
return admission.GetPodAdmitResult(err)
|
|
}
|
|
}
|
|
return admission.GetPodAdmitResult(nil)
|
|
}
|
|
|
|
func (s *containerScope) accumulateProvidersHints(pod *v1.Pod, container *v1.Container) []map[string][]TopologyHint {
|
|
var providersHints []map[string][]TopologyHint
|
|
|
|
for _, provider := range s.hintProviders {
|
|
// Get the TopologyHints for a Container from a provider.
|
|
hints := provider.GetTopologyHints(pod, container)
|
|
providersHints = append(providersHints, hints)
|
|
klog.InfoS("TopologyHints", "hints", hints, "pod", klog.KObj(pod), "containerName", container.Name)
|
|
}
|
|
return providersHints
|
|
}
|
|
|
|
func (s *containerScope) calculateAffinity(pod *v1.Pod, container *v1.Container) (TopologyHint, bool) {
|
|
providersHints := s.accumulateProvidersHints(pod, container)
|
|
bestHint, admit := s.policy.Merge(providersHints)
|
|
klog.InfoS("ContainerTopologyHint", "bestHint", bestHint)
|
|
return bestHint, admit
|
|
}
|