mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-24 03:40:56 +00:00
e06abce75f
This change completes the contextual logging migration for the memory manager by updating the Manager interface and all implementations to accept logr.Logger parameters instead of context.Context. Key changes: - Update Manager interface methods to accept logr.Logger: * AddContainer, RemoveContainer, GetMemoryNUMANodes * GetAllocatableMemory, GetMemory (removed context entirely) - Update Policy interface methods to accept logr.Logger instead of context.Context - Pass logger to NewManager() and policy constructors (NewPolicyStatic, NewPolicyNone, NewPolicyBestEffort) - Update internal_container_lifecycle to use klog.TODO() when calling memory manager methods - Update fake manager to accept and use logger parameter - Update all test code to pass logger instead of context This aligns with the contextual logging migration pattern where: - Functions that need a logger accept logr.Logger parameter directly - Logger is passed from the boundary (e.g., Start()) down to implementation - klog.TODO() is used temporarily in call sites where logger is not yet available - Context is only used where truly needed (e.g., Start() method) This follows the same pattern as recent migrations in: - pkg/kubelet/cm/topologymanager (#134174) - pkg/kubelet/cm/devicemanager (#134293) - pkg/kubelet/cm/cpumanager (#125912) Related to the initial memory manager contextual logging work in #130727. Signed-off-by: Swati Sehgal <swsehgal@redhat.com>
53 lines
1.5 KiB
Go
53 lines
1.5 KiB
Go
//go:build linux
|
|
// +build linux
|
|
|
|
/*
|
|
Copyright 2021 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 cm
|
|
|
|
import (
|
|
"strconv"
|
|
"strings"
|
|
|
|
v1 "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/util/sets"
|
|
runtimeapi "k8s.io/cri-api/pkg/apis/runtime/v1"
|
|
"k8s.io/klog/v2"
|
|
)
|
|
|
|
func (i *internalContainerLifecycleImpl) PreCreateContainer(pod *v1.Pod, container *v1.Container, containerConfig *runtimeapi.ContainerConfig) error {
|
|
if i.cpuManager != nil {
|
|
allocatedCPUs := i.cpuManager.GetCPUAffinity(string(pod.UID), container.Name)
|
|
if !allocatedCPUs.IsEmpty() {
|
|
containerConfig.Linux.Resources.CpusetCpus = allocatedCPUs.String()
|
|
}
|
|
}
|
|
|
|
if i.memoryManager != nil {
|
|
numaNodes := i.memoryManager.GetMemoryNUMANodes(klog.TODO(), pod, container)
|
|
if numaNodes.Len() > 0 {
|
|
var affinity []string
|
|
for _, numaNode := range sets.List(numaNodes) {
|
|
affinity = append(affinity, strconv.Itoa(numaNode))
|
|
}
|
|
containerConfig.Linux.Resources.CpusetMems = strings.Join(affinity, ",")
|
|
}
|
|
}
|
|
|
|
return nil
|
|
}
|