github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Checkpoint allocated requests and limits

Browse Source
This commit is contained in:
Tim Allclair 2024-10-17 22:28:53 -07:00
parent ee9e2294ff
commit 53aa727708
9 changed files with 72 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/kubelet/kubelet.go
View File

@ -2612,15 +2612,10 @@ func (kl *Kubelet) HandlePodAdditions(pods []*v1.Pod) {
// updateContainerResourceAllocation updates AllocatedResources values // updateContainerResourceAllocation updates AllocatedResources values
// (for cpu & memory) from checkpoint store // (for cpu & memory) from checkpoint store
func (kl *Kubelet) updateContainerResourceAllocation(pod *v1.Pod) { func (kl *Kubelet) updateContainerResourceAllocation(pod *v1.Pod) {
for _, c := range pod.Spec.Containers { for i, c := range pod.Spec.Containers {
allocatedResources, found := kl.statusManager.GetContainerResourceAllocation(string(pod.UID), c.Name) allocatedResources, found := kl.statusManager.GetContainerResourceAllocation(string(pod.UID), c.Name)
if c.Resources.Requests != nil && found { if found {
if _, ok := allocatedResources[v1.ResourceCPU]; ok { pod.Spec.Containers[i].Resources = allocatedResources
c.Resources.Requests[v1.ResourceCPU] = allocatedResources[v1.ResourceCPU]
}
if _, ok := allocatedResources[v1.ResourceMemory]; ok {
c.Resources.Requests[v1.ResourceMemory] = allocatedResources[v1.ResourceMemory]
}
} }
} }
} }

7
pkg/kubelet/kubelet_pods.go
View File

@ -2082,9 +2082,10 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
} }
container := kubecontainer.GetContainerSpec(pod, cName) container := kubecontainer.GetContainerSpec(pod, cName)
// AllocatedResources values come from checkpoint. It is the source-of-truth. // AllocatedResources values come from checkpoint. It is the source-of-truth.
found := false alloc, found := kl.statusManager.GetContainerResourceAllocation(string(pod.UID), cName)
status.AllocatedResources, found = kl.statusManager.GetContainerResourceAllocation(string(pod.UID), cName) if found {
if !(container.Resources.Requests == nil && container.Resources.Limits == nil) && !found { status.AllocatedResources = alloc.Requests
} else if !(container.Resources.Requests == nil && container.Resources.Limits == nil) {
// Log error and fallback to AllocatedResources in oldStatus if it exists // Log error and fallback to AllocatedResources in oldStatus if it exists
klog.ErrorS(nil, "resource allocation not found in checkpoint store", "pod", pod.Name, "container", cName) klog.ErrorS(nil, "resource allocation not found in checkpoint store", "pod", pod.Name, "container", cName)
if oldStatusFound { if oldStatusFound {

46
pkg/kubelet/kubelet_test.go
View File

@ -2447,8 +2447,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
name: "Having both memory and cpu, resource allocation not exists", name: "Having both memory and cpu, resource allocation not exists",
pod: podWithUIDNameNsSpec("1", "pod1", "foo", *cpu500mMem500MPodSpec), pod: podWithUIDNameNsSpec("1", "pod1", "foo", *cpu500mMem500MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"1": map[string]v1.ResourceList{ "1": map[string]v1.ResourceRequirements{
cpu500mMem500MPodSpec.Containers[0].Name: cpu500mMem500MPodSpec.Containers[0].Resources.Requests, cpu500mMem500MPodSpec.Containers[0].Name: cpu500mMem500MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2457,8 +2457,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("2", "pod2", "foo", *cpu500mMem500MPodSpec), pod: podWithUIDNameNsSpec("2", "pod2", "foo", *cpu500mMem500MPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("2", "pod2", "foo", *cpu500mMem500MPodSpec), existingPodAllocation: podWithUIDNameNsSpec("2", "pod2", "foo", *cpu500mMem500MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"2": map[string]v1.ResourceList{ "2": map[string]v1.ResourceRequirements{
cpu500mMem500MPodSpec.Containers[0].Name: cpu500mMem500MPodSpec.Containers[0].Resources.Requests, cpu500mMem500MPodSpec.Containers[0].Name: cpu500mMem500MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2467,8 +2467,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("3", "pod3", "foo", *cpu500mMem500MPodSpec), pod: podWithUIDNameNsSpec("3", "pod3", "foo", *cpu500mMem500MPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("3", "pod3", "foo", *cpu800mMem800MPodSpec), existingPodAllocation: podWithUIDNameNsSpec("3", "pod3", "foo", *cpu800mMem800MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"3": map[string]v1.ResourceList{ "3": map[string]v1.ResourceRequirements{
cpu800mMem800MPodSpec.Containers[0].Name: cpu800mMem800MPodSpec.Containers[0].Resources.Requests, cpu800mMem800MPodSpec.Containers[0].Name: cpu800mMem800MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2476,8 +2476,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
name: "Only has cpu, resource allocation not exists", name: "Only has cpu, resource allocation not exists",
pod: podWithUIDNameNsSpec("4", "pod5", "foo", *cpu500mPodSpec), pod: podWithUIDNameNsSpec("4", "pod5", "foo", *cpu500mPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"4": map[string]v1.ResourceList{ "4": map[string]v1.ResourceRequirements{
cpu500mPodSpec.Containers[0].Name: cpu500mPodSpec.Containers[0].Resources.Requests, cpu500mPodSpec.Containers[0].Name: cpu500mPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2486,8 +2486,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("5", "pod5", "foo", *cpu500mPodSpec), pod: podWithUIDNameNsSpec("5", "pod5", "foo", *cpu500mPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("5", "pod5", "foo", *cpu500mPodSpec), existingPodAllocation: podWithUIDNameNsSpec("5", "pod5", "foo", *cpu500mPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"5": map[string]v1.ResourceList{ "5": map[string]v1.ResourceRequirements{
cpu500mPodSpec.Containers[0].Name: cpu500mPodSpec.Containers[0].Resources.Requests, cpu500mPodSpec.Containers[0].Name: cpu500mPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2496,8 +2496,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("6", "pod6", "foo", *cpu500mPodSpec), pod: podWithUIDNameNsSpec("6", "pod6", "foo", *cpu500mPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("6", "pod6", "foo", *cpu800mPodSpec), existingPodAllocation: podWithUIDNameNsSpec("6", "pod6", "foo", *cpu800mPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"6": map[string]v1.ResourceList{ "6": map[string]v1.ResourceRequirements{
cpu800mPodSpec.Containers[0].Name: cpu800mPodSpec.Containers[0].Resources.Requests, cpu800mPodSpec.Containers[0].Name: cpu800mPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2505,8 +2505,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
name: "Only has memory, resource allocation not exists", name: "Only has memory, resource allocation not exists",
pod: podWithUIDNameNsSpec("7", "pod7", "foo", *mem500MPodSpec), pod: podWithUIDNameNsSpec("7", "pod7", "foo", *mem500MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"7": map[string]v1.ResourceList{ "7": map[string]v1.ResourceRequirements{
mem500MPodSpec.Containers[0].Name: mem500MPodSpec.Containers[0].Resources.Requests, mem500MPodSpec.Containers[0].Name: mem500MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2515,8 +2515,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("8", "pod8", "foo", *mem500MPodSpec), pod: podWithUIDNameNsSpec("8", "pod8", "foo", *mem500MPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("8", "pod8", "foo", *mem500MPodSpec), existingPodAllocation: podWithUIDNameNsSpec("8", "pod8", "foo", *mem500MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"8": map[string]v1.ResourceList{ "8": map[string]v1.ResourceRequirements{
mem500MPodSpec.Containers[0].Name: mem500MPodSpec.Containers[0].Resources.Requests, mem500MPodSpec.Containers[0].Name: mem500MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2525,8 +2525,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("9", "pod9", "foo", *mem500MPodSpec), pod: podWithUIDNameNsSpec("9", "pod9", "foo", *mem500MPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("9", "pod9", "foo", *mem800MPodSpec), existingPodAllocation: podWithUIDNameNsSpec("9", "pod9", "foo", *mem800MPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"9": map[string]v1.ResourceList{ "9": map[string]v1.ResourceRequirements{
mem800MPodSpec.Containers[0].Name: mem800MPodSpec.Containers[0].Resources.Requests, mem800MPodSpec.Containers[0].Name: mem800MPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2534,8 +2534,8 @@ func TestPodResourceAllocationReset(t *testing.T) {
name: "No CPU and memory, resource allocation not exists", name: "No CPU and memory, resource allocation not exists",
pod: podWithUIDNameNsSpec("10", "pod10", "foo", *emptyPodSpec), pod: podWithUIDNameNsSpec("10", "pod10", "foo", *emptyPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"10": map[string]v1.ResourceList{ "10": map[string]v1.ResourceRequirements{
emptyPodSpec.Containers[0].Name: emptyPodSpec.Containers[0].Resources.Requests, emptyPodSpec.Containers[0].Name: emptyPodSpec.Containers[0].Resources,
}, },
}, },
}, },
@ -2544,13 +2544,14 @@ func TestPodResourceAllocationReset(t *testing.T) {
pod: podWithUIDNameNsSpec("11", "pod11", "foo", *emptyPodSpec), pod: podWithUIDNameNsSpec("11", "pod11", "foo", *emptyPodSpec),
existingPodAllocation: podWithUIDNameNsSpec("11", "pod11", "foo", *emptyPodSpec), existingPodAllocation: podWithUIDNameNsSpec("11", "pod11", "foo", *emptyPodSpec),
expectedPodResourceAllocation: state.PodResourceAllocation{ expectedPodResourceAllocation: state.PodResourceAllocation{
"11": map[string]v1.ResourceList{ "11": map[string]v1.ResourceRequirements{
emptyPodSpec.Containers[0].Name: emptyPodSpec.Containers[0].Resources.Requests, emptyPodSpec.Containers[0].Name: emptyPodSpec.Containers[0].Resources,
}, },
}, },
}, },
} }
for _, tc := range tests { for _, tc := range tests {
t.Run(tc.name, func(t *testing.T) {
if tc.existingPodAllocation != nil { if tc.existingPodAllocation != nil {
// when kubelet restarts, AllocatedResources has already existed before adding pod // when kubelet restarts, AllocatedResources has already existed before adding pod
err := kubelet.statusManager.SetPodAllocation(tc.existingPodAllocation) err := kubelet.statusManager.SetPodAllocation(tc.existingPodAllocation)
@ -2565,6 +2566,7 @@ func TestPodResourceAllocationReset(t *testing.T) {
t.Fatalf("resource allocation should exist: (pod: %#v, container: %s)", tc.pod, tc.pod.Spec.Containers[0].Name) t.Fatalf("resource allocation should exist: (pod: %#v, container: %s)", tc.pod, tc.pod.Spec.Containers[0].Name)
} }
assert.Equal(t, tc.expectedPodResourceAllocation[string(tc.pod.UID)][tc.pod.Spec.Containers[0].Name], allocatedResources, tc.name) assert.Equal(t, tc.expectedPodResourceAllocation[string(tc.pod.UID)][tc.pod.Spec.Containers[0].Name], allocatedResources, tc.name)
})
} }
} }

6
pkg/kubelet/status/fake_status_manager.go
View File

@ -63,7 +63,7 @@ func (m *fakeManager) RemoveOrphanedStatuses(podUIDs map[types.UID]bool) {
return return
} }
func (m *fakeManager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) { func (m *fakeManager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
klog.InfoS("GetContainerResourceAllocation()") klog.InfoS("GetContainerResourceAllocation()")
return m.state.GetContainerResourceAllocation(podUID, containerName) return m.state.GetContainerResourceAllocation(podUID, containerName)
} }
@ -76,9 +76,9 @@ func (m *fakeManager) GetPodResizeStatus(podUID string) (v1.PodResizeStatus, boo
func (m *fakeManager) SetPodAllocation(pod *v1.Pod) error { func (m *fakeManager) SetPodAllocation(pod *v1.Pod) error {
klog.InfoS("SetPodAllocation()") klog.InfoS("SetPodAllocation()")
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
var alloc v1.ResourceList var alloc v1.ResourceRequirements
if container.Resources.Requests != nil { if container.Resources.Requests != nil {
alloc = container.Resources.Requests.DeepCopy() alloc = *container.Resources.DeepCopy()
} }
m.state.SetContainerResourceAllocation(string(pod.UID), container.Name, alloc) m.state.SetContainerResourceAllocation(string(pod.UID), container.Name, alloc)
} }

6
pkg/kubelet/status/state/checkpoint.go
View File

@ -19,7 +19,7 @@ package state
import ( import (
"encoding/json" "encoding/json"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"
) )
@ -28,7 +28,7 @@ var _ checkpointmanager.Checkpoint = &PodResourceAllocationCheckpoint{}
// PodResourceAllocationCheckpoint is used to store resources allocated to a pod in checkpoint // PodResourceAllocationCheckpoint is used to store resources allocated to a pod in checkpoint
type PodResourceAllocationCheckpoint struct { type PodResourceAllocationCheckpoint struct {
AllocationEntries map[string]map[string]v1.ResourceList `json:"allocationEntries,omitempty"` AllocationEntries map[string]map[string]v1.ResourceRequirements `json:"allocationEntries,omitempty"`
ResizeStatusEntries map[string]v1.PodResizeStatus `json:"resizeStatusEntries,omitempty"` ResizeStatusEntries map[string]v1.PodResizeStatus `json:"resizeStatusEntries,omitempty"`
Checksum checksum.Checksum `json:"checksum"` Checksum checksum.Checksum `json:"checksum"`
} }
@ -37,7 +37,7 @@ type PodResourceAllocationCheckpoint struct {
func NewPodResourceAllocationCheckpoint() *PodResourceAllocationCheckpoint { func NewPodResourceAllocationCheckpoint() *PodResourceAllocationCheckpoint {
//lint:ignore unexported-type-in-api user-facing error message //lint:ignore unexported-type-in-api user-facing error message
return &PodResourceAllocationCheckpoint{ return &PodResourceAllocationCheckpoint{
AllocationEntries: make(map[string]map[string]v1.ResourceList), AllocationEntries: make(map[string]map[string]v1.ResourceRequirements),
ResizeStatusEntries: make(map[string]v1.PodResizeStatus), ResizeStatusEntries: make(map[string]v1.PodResizeStatus),
} }
} }

12
pkg/kubelet/status/state/state.go
View File

@ -17,11 +17,11 @@ limitations under the License.
package state package state
import ( import (
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
) )
// PodResourceAllocation type is used in tracking resources allocated to pod's containers // PodResourceAllocation type is used in tracking resources allocated to pod's containers
type PodResourceAllocation map[string]map[string]v1.ResourceList type PodResourceAllocation map[string]map[string]v1.ResourceRequirements
// PodResizeStatus type is used in tracking the last resize decision for pod // PodResizeStatus type is used in tracking the last resize decision for pod
type PodResizeStatus map[string]v1.PodResizeStatus type PodResizeStatus map[string]v1.PodResizeStatus
@ -30,9 +30,9 @@ type PodResizeStatus map[string]v1.PodResizeStatus
func (pr PodResourceAllocation) Clone() PodResourceAllocation { func (pr PodResourceAllocation) Clone() PodResourceAllocation {
prCopy := make(PodResourceAllocation) prCopy := make(PodResourceAllocation)
for pod := range pr { for pod := range pr {
prCopy[pod] = make(map[string]v1.ResourceList) prCopy[pod] = make(map[string]v1.ResourceRequirements)
for container, alloc := range pr[pod] { for container, alloc := range pr[pod] {
prCopy[pod][container] = alloc.DeepCopy() prCopy[pod][container] = *alloc.DeepCopy()
} }
} }
return prCopy return prCopy
@ -40,14 +40,14 @@ func (pr PodResourceAllocation) Clone() PodResourceAllocation {
// Reader interface used to read current pod resource allocation state // Reader interface used to read current pod resource allocation state
type Reader interface { type Reader interface {
GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool)
GetPodResourceAllocation() PodResourceAllocation GetPodResourceAllocation() PodResourceAllocation
GetPodResizeStatus(podUID string) (v1.PodResizeStatus, bool) GetPodResizeStatus(podUID string) (v1.PodResizeStatus, bool)
GetResizeStatus() PodResizeStatus GetResizeStatus() PodResizeStatus
} }
type writer interface { type writer interface {
SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceList) error SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error
SetPodResourceAllocation(PodResourceAllocation) error SetPodResourceAllocation(PodResourceAllocation) error
SetPodResizeStatus(podUID string, resizeStatus v1.PodResizeStatus) error SetPodResizeStatus(podUID string, resizeStatus v1.PodResizeStatus) error
SetResizeStatus(PodResizeStatus) error SetResizeStatus(PodResizeStatus) error

14
pkg/kubelet/status/state/state_checkpoint.go
View File

@ -21,7 +21,7 @@ import (
"path" "path"
"sync" "sync"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2" "k8s.io/klog/v2"
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors" "k8s.io/kubernetes/pkg/kubelet/checkpointmanager/errors"
@ -82,7 +82,7 @@ func (sc *stateCheckpoint) storeState() error {
podAllocation := sc.cache.GetPodResourceAllocation() podAllocation := sc.cache.GetPodResourceAllocation()
for pod := range podAllocation { for pod := range podAllocation {
checkpoint.AllocationEntries[pod] = make(map[string]v1.ResourceList) checkpoint.AllocationEntries[pod] = make(map[string]v1.ResourceRequirements)
for container, alloc := range podAllocation[pod] { for container, alloc := range podAllocation[pod] {
checkpoint.AllocationEntries[pod][container] = alloc checkpoint.AllocationEntries[pod][container] = alloc
} }
@ -103,7 +103,7 @@ func (sc *stateCheckpoint) storeState() error {
} }
// GetContainerResourceAllocation returns current resources allocated to a pod's container // GetContainerResourceAllocation returns current resources allocated to a pod's container
func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) { func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
sc.mux.RLock() sc.mux.RLock()
defer sc.mux.RUnlock() defer sc.mux.RUnlock()
return sc.cache.GetContainerResourceAllocation(podUID, containerName) return sc.cache.GetContainerResourceAllocation(podUID, containerName)
@ -131,7 +131,7 @@ func (sc *stateCheckpoint) GetResizeStatus() PodResizeStatus {
} }
// SetContainerResourceAllocation sets resources allocated to a pod's container // SetContainerResourceAllocation sets resources allocated to a pod's container
func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceList) error { func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {
sc.mux.Lock() sc.mux.Lock()
defer sc.mux.Unlock() defer sc.mux.Unlock()
sc.cache.SetContainerResourceAllocation(podUID, containerName, alloc) sc.cache.SetContainerResourceAllocation(podUID, containerName, alloc)
@ -185,8 +185,8 @@ func NewNoopStateCheckpoint() State {
return &noopStateCheckpoint{} return &noopStateCheckpoint{}
} }
func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ string, _ string) (v1.ResourceList, bool) { func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ string, _ string) (v1.ResourceRequirements, bool) {
return nil, false return v1.ResourceRequirements{}, false
} }
func (sc *noopStateCheckpoint) GetPodResourceAllocation() PodResourceAllocation { func (sc *noopStateCheckpoint) GetPodResourceAllocation() PodResourceAllocation {
@ -201,7 +201,7 @@ func (sc *noopStateCheckpoint) GetResizeStatus() PodResizeStatus {
return nil return nil
} }
func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ string, _ string, _ v1.ResourceList) error { func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ string, _ string, _ v1.ResourceRequirements) error {
return nil return nil
} }

10
pkg/kubelet/status/state/state_mem.go
View File

@ -19,7 +19,7 @@ package state
import ( import (
"sync" "sync"
"k8s.io/api/core/v1" v1 "k8s.io/api/core/v1"
"k8s.io/klog/v2" "k8s.io/klog/v2"
) )
@ -40,12 +40,12 @@ func NewStateMemory() State {
} }
} }
func (s *stateMemory) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) { func (s *stateMemory) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
s.RLock() s.RLock()
defer s.RUnlock() defer s.RUnlock()
alloc, ok := s.podAllocation[podUID][containerName] alloc, ok := s.podAllocation[podUID][containerName]
return alloc.DeepCopy(), ok return *alloc.DeepCopy(), ok
} }
func (s *stateMemory) GetPodResourceAllocation() PodResourceAllocation { func (s *stateMemory) GetPodResourceAllocation() PodResourceAllocation {
@ -72,12 +72,12 @@ func (s *stateMemory) GetResizeStatus() PodResizeStatus {
return prs return prs
} }
func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceList) error { func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {
s.Lock() s.Lock()
defer s.Unlock() defer s.Unlock()
if _, ok := s.podAllocation[podUID]; !ok { if _, ok := s.podAllocation[podUID]; !ok {
s.podAllocation[podUID] = make(map[string]v1.ResourceList) s.podAllocation[podUID] = make(map[string]v1.ResourceRequirements)
} }
s.podAllocation[podUID][containerName] = alloc s.podAllocation[podUID][containerName] = alloc

9
pkg/kubelet/status/status_manager.go
View File

@ -144,7 +144,7 @@ type Manager interface {
RemoveOrphanedStatuses(podUIDs map[types.UID]bool) RemoveOrphanedStatuses(podUIDs map[types.UID]bool)
// GetContainerResourceAllocation returns checkpointed AllocatedResources value for the container // GetContainerResourceAllocation returns checkpointed AllocatedResources value for the container
GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool)
// GetPodResizeStatus returns checkpointed PodStatus.Resize value // GetPodResizeStatus returns checkpointed PodStatus.Resize value
GetPodResizeStatus(podUID string) (v1.PodResizeStatus, bool) GetPodResizeStatus(podUID string) (v1.PodResizeStatus, bool)
@ -236,7 +236,7 @@ func (m *manager) Start() {
// GetContainerResourceAllocation returns the last checkpointed AllocatedResources values // GetContainerResourceAllocation returns the last checkpointed AllocatedResources values
// If checkpoint manager has not been initialized, it returns nil, false // If checkpoint manager has not been initialized, it returns nil, false
func (m *manager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceList, bool) { func (m *manager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
m.podStatusesLock.RLock() m.podStatusesLock.RLock()
defer m.podStatusesLock.RUnlock() defer m.podStatusesLock.RUnlock()
return m.state.GetContainerResourceAllocation(podUID, containerName) return m.state.GetContainerResourceAllocation(podUID, containerName)
@ -255,10 +255,7 @@ func (m *manager) SetPodAllocation(pod *v1.Pod) error {
m.podStatusesLock.RLock() m.podStatusesLock.RLock()
defer m.podStatusesLock.RUnlock() defer m.podStatusesLock.RUnlock()
for _, container := range pod.Spec.Containers { for _, container := range pod.Spec.Containers {
var alloc v1.ResourceList alloc := *container.Resources.DeepCopy()
if container.Resources.Requests != nil {
alloc = container.Resources.Requests.DeepCopy()
}
if err := m.state.SetContainerResourceAllocation(string(pod.UID), container.Name, alloc); err != nil { if err := m.state.SetContainerResourceAllocation(string(pod.UID), container.Name, alloc); err != nil {
return err return err
} }