Merge pull request kubernetes#130576 from tallclair/allocated-uid

k8s-ci-robot · web-flow · commit 9d9e1afdf78b · 2025-03-04T16:41:51.000-08:00
Change allocation manager pod UID to types.UID
diff --git a/pkg/kubelet/allocation/allocation_manager.go b/pkg/kubelet/allocation/allocation_manager.go
@@ -34,7 +34,7 @@ const podStatusManagerStateFile = "pod_status_manager_state"
 // AllocationManager tracks pod resource allocations.
 type Manager interface {
 	// GetContainerResourceAllocation returns the AllocatedResources value for the container
-	GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool)
+	GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool)
 
 	// UpdatePodFromAllocation overwrites the pod spec with the allocation.
 	// This function does a deep copy only if updates are needed.
@@ -83,7 +83,7 @@ func NewInMemoryManager() Manager {
 
 // GetContainerResourceAllocation returns the last checkpointed AllocatedResources values
 // If checkpoint manager has not been initialized, it returns nil, false
-func (m *manager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
+func (m *manager) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {
 	return m.state.GetContainerResourceAllocation(podUID, containerName)
 }
 
@@ -96,7 +96,7 @@ func (m *manager) UpdatePodFromAllocation(pod *v1.Pod) (*v1.Pod, bool) {
 }
 
 func updatePodFromAllocation(pod *v1.Pod, allocs state.PodResourceAllocation) (*v1.Pod, bool) {
-	allocated, found := allocs[string(pod.UID)]
+	allocated, found := allocs[pod.UID]
 	if !found {
 		return pod, false
 	}
@@ -149,11 +149,11 @@ func (m *manager) SetPodAllocation(pod *v1.Pod) error {
 		}
 	}
 
-	return m.state.SetPodResourceAllocation(string(pod.UID), podAlloc)
+	return m.state.SetPodResourceAllocation(pod.UID, podAlloc)
 }
 
 func (m *manager) DeletePodAllocation(uid types.UID) {
-	if err := m.state.Delete(string(uid), ""); err != nil {
+	if err := m.state.Delete(uid, ""); err != nil {
 		// If the deletion fails, it will be retried by RemoveOrphanedPods, so we can safely ignore the error.
 		klog.V(3).ErrorS(err, "Failed to delete pod allocation", "podUID", uid)
 	}
diff --git a/pkg/kubelet/allocation/allocation_manager_test.go b/pkg/kubelet/allocation/allocation_manager_test.go
@@ -110,7 +110,7 @@ func TestUpdatePodFromAllocation(t *testing.T) {
 		name: "steady state",
 		pod:  pod,
 		allocs: state.PodResourceAllocation{
-			string(pod.UID): map[string]v1.ResourceRequirements{
+			pod.UID: map[string]v1.ResourceRequirements{
 				"c1":                  *pod.Spec.Containers[0].Resources.DeepCopy(),
 				"c2":                  *pod.Spec.Containers[1].Resources.DeepCopy(),
 				"c1-restartable-init": *pod.Spec.InitContainers[0].Resources.DeepCopy(),
@@ -127,7 +127,7 @@ func TestUpdatePodFromAllocation(t *testing.T) {
 		name: "missing container allocation",
 		pod:  pod,
 		allocs: state.PodResourceAllocation{
-			string(pod.UID): map[string]v1.ResourceRequirements{
+			pod.UID: map[string]v1.ResourceRequirements{
 				"c2": *pod.Spec.Containers[1].Resources.DeepCopy(),
 			},
 		},
@@ -136,7 +136,7 @@ func TestUpdatePodFromAllocation(t *testing.T) {
 		name: "resized container",
 		pod:  pod,
 		allocs: state.PodResourceAllocation{
-			string(pod.UID): map[string]v1.ResourceRequirements{
+			pod.UID: map[string]v1.ResourceRequirements{
 				"c1":                  *resizedPod.Spec.Containers[0].Resources.DeepCopy(),
 				"c2":                  *resizedPod.Spec.Containers[1].Resources.DeepCopy(),
 				"c1-restartable-init": *resizedPod.Spec.InitContainers[0].Resources.DeepCopy(),
diff --git a/pkg/kubelet/allocation/state/checkpoint.go b/pkg/kubelet/allocation/state/checkpoint.go
@@ -21,14 +21,15 @@ import (
 	"fmt"
 
 	v1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"
 )
 
 var _ checkpointmanager.Checkpoint = &Checkpoint{}
 
 type PodResourceAllocationInfo struct {
-	AllocationEntries map[string]map[string]v1.ResourceRequirements `json:"allocationEntries,omitempty"`
+	AllocationEntries map[types.UID]map[string]v1.ResourceRequirements `json:"allocationEntries,omitempty"`
 }
 
 // Checkpoint represents a structure to store pod resource allocation checkpoint data
diff --git a/pkg/kubelet/allocation/state/state.go b/pkg/kubelet/allocation/state/state.go
@@ -23,10 +23,7 @@ import (
 )
 
 // PodResourceAllocation type is used in tracking resources allocated to pod's containers
-type PodResourceAllocation map[string]map[string]v1.ResourceRequirements
-
-// PodResizeStatus type is used in tracking the last resize decision for pod
-type PodResizeStatus map[string]v1.PodResizeStatus
+type PodResourceAllocation map[types.UID]map[string]v1.ResourceRequirements
 
 // Clone returns a copy of PodResourceAllocation
 func (pr PodResourceAllocation) Clone() PodResourceAllocation {
@@ -42,14 +39,14 @@ func (pr PodResourceAllocation) Clone() PodResourceAllocation {
 
 // Reader interface used to read current pod resource allocation state
 type Reader interface {
-	GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool)
+	GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool)
 	GetPodResourceAllocation() PodResourceAllocation
 }
 
 type writer interface {
-	SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error
-	SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error
-	Delete(podUID string, containerName string) error
+	SetContainerResourceAllocation(podUID types.UID, containerName string, alloc v1.ResourceRequirements) error
+	SetPodResourceAllocation(podUID types.UID, alloc map[string]v1.ResourceRequirements) error
+	Delete(podUID types.UID, containerName string) error
 	// RemoveOrphanedPods removes the stored state for any pods not included in the set of remaining pods.
 	RemoveOrphanedPods(remainingPods sets.Set[types.UID])
 }
diff --git a/pkg/kubelet/allocation/state/state_checkpoint.go b/pkg/kubelet/allocation/state/state_checkpoint.go
@@ -68,7 +68,7 @@ func restoreState(checkpointManager checkpointmanager.CheckpointManager, checkpo
 	if err = checkpointManager.GetCheckpoint(checkpointName, checkpoint); err != nil {
 		if err == errors.ErrCheckpointNotFound {
 			return &PodResourceAllocationInfo{
-				AllocationEntries: make(map[string]map[string]v1.ResourceRequirements),
+				AllocationEntries: make(map[types.UID]map[string]v1.ResourceRequirements),
 			}, nil
 		}
 		return nil, err
@@ -101,7 +101,7 @@ func (sc *stateCheckpoint) storeState() error {
 }
 
 // GetContainerResourceAllocation returns current resources allocated to a pod's container
-func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
+func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {
 	sc.mux.RLock()
 	defer sc.mux.RUnlock()
 	return sc.cache.GetContainerResourceAllocation(podUID, containerName)
@@ -115,15 +115,15 @@ func (sc *stateCheckpoint) GetPodResourceAllocation() PodResourceAllocation {
 }
 
 // SetContainerResourceAllocation sets resources allocated to a pod's container
-func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {
+func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID types.UID, containerName string, alloc v1.ResourceRequirements) error {
 	sc.mux.Lock()
 	defer sc.mux.Unlock()
 	sc.cache.SetContainerResourceAllocation(podUID, containerName, alloc)
 	return sc.storeState()
 }
 
 // SetPodResourceAllocation sets pod resource allocation
-func (sc *stateCheckpoint) SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error {
+func (sc *stateCheckpoint) SetPodResourceAllocation(podUID types.UID, alloc map[string]v1.ResourceRequirements) error {
 	sc.mux.Lock()
 	defer sc.mux.Unlock()
 	err := sc.cache.SetPodResourceAllocation(podUID, alloc)
@@ -134,7 +134,7 @@ func (sc *stateCheckpoint) SetPodResourceAllocation(podUID string, alloc map[str
 }
 
 // Delete deletes allocations for specified pod
-func (sc *stateCheckpoint) Delete(podUID string, containerName string) error {
+func (sc *stateCheckpoint) Delete(podUID types.UID, containerName string) error {
 	sc.mux.Lock()
 	defer sc.mux.Unlock()
 	sc.cache.Delete(podUID, containerName)
@@ -154,23 +154,23 @@ func NewNoopStateCheckpoint() State {
 	return &noopStateCheckpoint{}
 }
 
-func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ string, _ string) (v1.ResourceRequirements, bool) {
+func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ types.UID, _ string) (v1.ResourceRequirements, bool) {
 	return v1.ResourceRequirements{}, false
 }
 
 func (sc *noopStateCheckpoint) GetPodResourceAllocation() PodResourceAllocation {
 	return nil
 }
 
-func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ string, _ string, _ v1.ResourceRequirements) error {
+func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ types.UID, _ string, _ v1.ResourceRequirements) error {
 	return nil
 }
 
-func (sc *noopStateCheckpoint) SetPodResourceAllocation(_ string, _ map[string]v1.ResourceRequirements) error {
+func (sc *noopStateCheckpoint) SetPodResourceAllocation(_ types.UID, _ map[string]v1.ResourceRequirements) error {
 	return nil
 }
 
-func (sc *noopStateCheckpoint) Delete(_ string, _ string) error {
+func (sc *noopStateCheckpoint) Delete(_ types.UID, _ string) error {
 	return nil
 }
 
diff --git a/pkg/kubelet/allocation/state/state_checkpoint_test.go b/pkg/kubelet/allocation/state/state_checkpoint_test.go
@@ -25,6 +25,7 @@ import (
 
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"
 )
 
@@ -138,7 +139,7 @@ func Test_stateCheckpoint_formatUpgraded(t *testing.T) {
 	// pretend that the old checkpoint is unaware for the field ResizeStatusEntries
 	const checkpointContent = `{"data":"{\"allocationEntries\":{\"pod1\":{\"container1\":{\"requests\":{\"cpu\":\"1Ki\",\"memory\":\"1Ki\"}}}}}","checksum":1555601526}`
 	expectedPodResourceAllocationInfo := &PodResourceAllocationInfo{
-		AllocationEntries: map[string]map[string]v1.ResourceRequirements{
+		AllocationEntries: map[types.UID]map[string]v1.ResourceRequirements{
 			"pod1": {
 				"container1": {
 					Requests: v1.ResourceList{
diff --git a/pkg/kubelet/allocation/state/state_mem.go b/pkg/kubelet/allocation/state/state_mem.go
@@ -43,7 +43,7 @@ func NewStateMemory(alloc PodResourceAllocation) State {
 	}
 }
 
-func (s *stateMemory) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {
+func (s *stateMemory) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {
 	s.RLock()
 	defer s.RUnlock()
 
@@ -57,7 +57,7 @@ func (s *stateMemory) GetPodResourceAllocation() PodResourceAllocation {
 	return s.podAllocation.Clone()
 }
 
-func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {
+func (s *stateMemory) SetContainerResourceAllocation(podUID types.UID, containerName string, alloc v1.ResourceRequirements) error {
 	s.Lock()
 	defer s.Unlock()
 
@@ -70,7 +70,7 @@ func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerNam
 	return nil
 }
 
-func (s *stateMemory) SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error {
+func (s *stateMemory) SetPodResourceAllocation(podUID types.UID, alloc map[string]v1.ResourceRequirements) error {
 	s.Lock()
 	defer s.Unlock()
 
@@ -79,15 +79,15 @@ func (s *stateMemory) SetPodResourceAllocation(podUID string, alloc map[string]v
 	return nil
 }
 
-func (s *stateMemory) deleteContainer(podUID string, containerName string) {
+func (s *stateMemory) deleteContainer(podUID types.UID, containerName string) {
 	delete(s.podAllocation[podUID], containerName)
 	if len(s.podAllocation[podUID]) == 0 {
 		delete(s.podAllocation, podUID)
 	}
 	klog.V(3).InfoS("Deleted pod resource allocation", "podUID", podUID, "containerName", containerName)
 }
 
-func (s *stateMemory) Delete(podUID string, containerName string) error {
+func (s *stateMemory) Delete(podUID types.UID, containerName string) error {
 	s.Lock()
 	defer s.Unlock()
 	if len(containerName) == 0 {
diff --git a/pkg/kubelet/kubelet_pods.go b/pkg/kubelet/kubelet_pods.go
@@ -2149,7 +2149,7 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
 
 		// Always set the status to the latest allocated resources, even if it differs from the
 		// allocation used by the current sync loop.
-		alloc, found := kl.allocationManager.GetContainerResourceAllocation(string(pod.UID), cName)
+		alloc, found := kl.allocationManager.GetContainerResourceAllocation(pod.UID, cName)
 		if !found {
 			// This case is expected for non-resizable containers (ephemeral & non-restartable init containers).
 			// Don't set status.Resources in this case.
@@ -2369,7 +2369,7 @@ func (kl *Kubelet) convertToAPIContainerStatuses(pod *v1.Pod, podStatus *kubecon
 			status.Resources = convertContainerStatusResources(cName, status, cStatus, oldStatuses)
 
 			if utilfeature.DefaultFeatureGate.Enabled(features.InPlacePodVerticalScalingAllocatedStatus) {
-				if alloc, found := kl.allocationManager.GetContainerResourceAllocation(string(pod.UID), cName); found {
+				if alloc, found := kl.allocationManager.GetContainerResourceAllocation(pod.UID, cName); found {
 					status.AllocatedResources = alloc.Requests
 				}
 			}
diff --git a/pkg/kubelet/kubelet_test.go b/pkg/kubelet/kubelet_test.go
@@ -2575,11 +2575,11 @@ func TestPodResourceAllocationReset(t *testing.T) {
 			}
 			kubelet.HandlePodAdditions([]*v1.Pod{tc.pod})
 
-			allocatedResources, found := kubelet.allocationManager.GetContainerResourceAllocation(string(tc.pod.UID), tc.pod.Spec.Containers[0].Name)
+			allocatedResources, found := kubelet.allocationManager.GetContainerResourceAllocation(tc.pod.UID, tc.pod.Spec.Containers[0].Name)
 			if !found {
 				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[tc.pod.UID][tc.pod.Spec.Containers[0].Name], allocatedResources, tc.name)
 		})
 	}
 }
@@ -2949,7 +2949,7 @@ func TestHandlePodResourcesResize(t *testing.T) {
 				assert.Equal(t, tt.expectedAllocatedReqs, updatedPodCtr.Resources.Requests, "updated pod spec requests")
 				assert.Equal(t, tt.expectedAllocatedLims, updatedPodCtr.Resources.Limits, "updated pod spec limits")
 
-				alloc, found := kubelet.allocationManager.GetContainerResourceAllocation(string(newPod.UID), updatedPodCtr.Name)
+				alloc, found := kubelet.allocationManager.GetContainerResourceAllocation(newPod.UID, updatedPodCtr.Name)
 				require.True(t, found, "container allocation")
 				assert.Equal(t, tt.expectedAllocatedReqs, alloc.Requests, "stored container request allocation")
 				assert.Equal(t, tt.expectedAllocatedLims, alloc.Limits, "stored container limit allocation")

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ const podStatusManagerStateFile = "pod_status_manager_state"`
`34`	`34`	`// AllocationManager tracks pod resource allocations.`
`35`	`35`	`type Manager interface {`
`36`	`36`	`// GetContainerResourceAllocation returns the AllocatedResources value for the container`
`37`		`- GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool)`
	`37`	`+ GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool)`
`38`	`38`
`39`	`39`	`// UpdatePodFromAllocation overwrites the pod spec with the allocation.`
`40`	`40`	`// This function does a deep copy only if updates are needed.`
`@@ -83,7 +83,7 @@ func NewInMemoryManager() Manager {`
`83`	`83`
`84`	`84`	`// GetContainerResourceAllocation returns the last checkpointed AllocatedResources values`
`85`	`85`	`// If checkpoint manager has not been initialized, it returns nil, false`
`86`		`-func (m *manager) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {`
	`86`	`+func (m *manager) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {`
`87`	`87`	`return m.state.GetContainerResourceAllocation(podUID, containerName)`
`88`	`88`	`}`
`89`	`89`
`@@ -96,7 +96,7 @@ func (m manager) UpdatePodFromAllocation(pod v1.Pod) (*v1.Pod, bool) {`
`96`	`96`	`}`
`97`	`97`
`98`	`98`	`func updatePodFromAllocation(pod v1.Pod, allocs state.PodResourceAllocation) (v1.Pod, bool) {`
`99`		`- allocated, found := allocs[string(pod.UID)]`
	`99`	`+ allocated, found := allocs[pod.UID]`
`100`	`100`	`if !found {`
`101`	`101`	`return pod, false`
`102`	`102`	`}`
`@@ -149,11 +149,11 @@ func (m manager) SetPodAllocation(pod v1.Pod) error {`
`149`	`149`	`}`
`150`	`150`	`}`
`151`	`151`
`152`		`- return m.state.SetPodResourceAllocation(string(pod.UID), podAlloc)`
	`152`	`+ return m.state.SetPodResourceAllocation(pod.UID, podAlloc)`
`153`	`153`	`}`
`154`	`154`
`155`	`155`	`func (m *manager) DeletePodAllocation(uid types.UID) {`
`156`		`- if err := m.state.Delete(string(uid), ""); err != nil {`
	`156`	`+ if err := m.state.Delete(uid, ""); err != nil {`
`157`	`157`	`// If the deletion fails, it will be retried by RemoveOrphanedPods, so we can safely ignore the error.`
`158`	`158`	`klog.V(3).ErrorS(err, "Failed to delete pod allocation", "podUID", uid)`
`159`	`159`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,14 +21,15 @@ import (`
`21`	`21`	`"fmt"`
`22`	`22`
`23`	`23`	`v1 "k8s.io/api/core/v1"`
	`24`	`+ "k8s.io/apimachinery/pkg/types"`
`24`	`25`	`"k8s.io/kubernetes/pkg/kubelet/checkpointmanager"`
`25`	`26`	`"k8s.io/kubernetes/pkg/kubelet/checkpointmanager/checksum"`
`26`	`27`	`)`
`27`	`28`
`28`	`29`	`var _ checkpointmanager.Checkpoint = &Checkpoint{}`
`29`	`30`
`30`	`31`	`type PodResourceAllocationInfo struct {`
`31`		- AllocationEntries map[string]map[string]v1.ResourceRequirements `json:"allocationEntries,omitempty"`
	`32`	+ AllocationEntries map[types.UID]map[string]v1.ResourceRequirements `json:"allocationEntries,omitempty"`
`32`	`33`	`}`
`33`	`34`
`34`	`35`	`// Checkpoint represents a structure to store pod resource allocation checkpoint data`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func restoreState(checkpointManager checkpointmanager.CheckpointManager, checkpo`
`68`	`68`	`if err = checkpointManager.GetCheckpoint(checkpointName, checkpoint); err != nil {`
`69`	`69`	`if err == errors.ErrCheckpointNotFound {`
`70`	`70`	`return &PodResourceAllocationInfo{`
`71`		`- AllocationEntries: make(map[string]map[string]v1.ResourceRequirements),`
	`71`	`+ AllocationEntries: make(map[types.UID]map[string]v1.ResourceRequirements),`
`72`	`72`	`}, nil`
`73`	`73`	`}`
`74`	`74`	`return nil, err`
`@@ -101,7 +101,7 @@ func (sc *stateCheckpoint) storeState() error {`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`// GetContainerResourceAllocation returns current resources allocated to a pod's container`
`104`		`-func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {`
	`104`	`+func (sc *stateCheckpoint) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {`
`105`	`105`	`sc.mux.RLock()`
`106`	`106`	`defer sc.mux.RUnlock()`
`107`	`107`	`return sc.cache.GetContainerResourceAllocation(podUID, containerName)`
`@@ -115,15 +115,15 @@ func (sc *stateCheckpoint) GetPodResourceAllocation() PodResourceAllocation {`
`115`	`115`	`}`
`116`	`116`
`117`	`117`	`// SetContainerResourceAllocation sets resources allocated to a pod's container`
`118`		`-func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {`
	`118`	`+func (sc *stateCheckpoint) SetContainerResourceAllocation(podUID types.UID, containerName string, alloc v1.ResourceRequirements) error {`
`119`	`119`	`sc.mux.Lock()`
`120`	`120`	`defer sc.mux.Unlock()`
`121`	`121`	`sc.cache.SetContainerResourceAllocation(podUID, containerName, alloc)`
`122`	`122`	`return sc.storeState()`
`123`	`123`	`}`
`124`	`124`
`125`	`125`	`// SetPodResourceAllocation sets pod resource allocation`
`126`		`-func (sc *stateCheckpoint) SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error {`
	`126`	`+func (sc *stateCheckpoint) SetPodResourceAllocation(podUID types.UID, alloc map[string]v1.ResourceRequirements) error {`
`127`	`127`	`sc.mux.Lock()`
`128`	`128`	`defer sc.mux.Unlock()`
`129`	`129`	`err := sc.cache.SetPodResourceAllocation(podUID, alloc)`
`@@ -134,7 +134,7 @@ func (sc *stateCheckpoint) SetPodResourceAllocation(podUID string, alloc map[str`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`// Delete deletes allocations for specified pod`
`137`		`-func (sc *stateCheckpoint) Delete(podUID string, containerName string) error {`
	`137`	`+func (sc *stateCheckpoint) Delete(podUID types.UID, containerName string) error {`
`138`	`138`	`sc.mux.Lock()`
`139`	`139`	`defer sc.mux.Unlock()`
`140`	`140`	`sc.cache.Delete(podUID, containerName)`
`@@ -154,23 +154,23 @@ func NewNoopStateCheckpoint() State {`
`154`	`154`	`return &noopStateCheckpoint{}`
`155`	`155`	`}`
`156`	`156`
`157`		`-func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ string, _ string) (v1.ResourceRequirements, bool) {`
	`157`	`+func (sc *noopStateCheckpoint) GetContainerResourceAllocation(_ types.UID, _ string) (v1.ResourceRequirements, bool) {`
`158`	`158`	`return v1.ResourceRequirements{}, false`
`159`	`159`	`}`
`160`	`160`
`161`	`161`	`func (sc *noopStateCheckpoint) GetPodResourceAllocation() PodResourceAllocation {`
`162`	`162`	`return nil`
`163`	`163`	`}`
`164`	`164`
`165`		`-func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ string, _ string, _ v1.ResourceRequirements) error {`
	`165`	`+func (sc *noopStateCheckpoint) SetContainerResourceAllocation(_ types.UID, _ string, _ v1.ResourceRequirements) error {`
`166`	`166`	`return nil`
`167`	`167`	`}`
`168`	`168`
`169`		`-func (sc *noopStateCheckpoint) SetPodResourceAllocation(_ string, _ map[string]v1.ResourceRequirements) error {`
	`169`	`+func (sc *noopStateCheckpoint) SetPodResourceAllocation(_ types.UID, _ map[string]v1.ResourceRequirements) error {`
`170`	`170`	`return nil`
`171`	`171`	`}`
`172`	`172`
`173`		`-func (sc *noopStateCheckpoint) Delete(_ string, _ string) error {`
	`173`	`+func (sc *noopStateCheckpoint) Delete(_ types.UID, _ string) error {`
`174`	`174`	`return nil`
`175`	`175`	`}`
`176`	`176`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func NewStateMemory(alloc PodResourceAllocation) State {`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
`46`		`-func (s *stateMemory) GetContainerResourceAllocation(podUID string, containerName string) (v1.ResourceRequirements, bool) {`
	`46`	`+func (s *stateMemory) GetContainerResourceAllocation(podUID types.UID, containerName string) (v1.ResourceRequirements, bool) {`
`47`	`47`	`s.RLock()`
`48`	`48`	`defer s.RUnlock()`
`49`	`49`
`@@ -57,7 +57,7 @@ func (s *stateMemory) GetPodResourceAllocation() PodResourceAllocation {`
`57`	`57`	`return s.podAllocation.Clone()`
`58`	`58`	`}`
`59`	`59`
`60`		`-func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerName string, alloc v1.ResourceRequirements) error {`
	`60`	`+func (s *stateMemory) SetContainerResourceAllocation(podUID types.UID, containerName string, alloc v1.ResourceRequirements) error {`
`61`	`61`	`s.Lock()`
`62`	`62`	`defer s.Unlock()`
`63`	`63`
`@@ -70,7 +70,7 @@ func (s *stateMemory) SetContainerResourceAllocation(podUID string, containerNam`
`70`	`70`	`return nil`
`71`	`71`	`}`
`72`	`72`
`73`		`-func (s *stateMemory) SetPodResourceAllocation(podUID string, alloc map[string]v1.ResourceRequirements) error {`
	`73`	`+func (s *stateMemory) SetPodResourceAllocation(podUID types.UID, alloc map[string]v1.ResourceRequirements) error {`
`74`	`74`	`s.Lock()`
`75`	`75`	`defer s.Unlock()`
`76`	`76`
`@@ -79,15 +79,15 @@ func (s *stateMemory) SetPodResourceAllocation(podUID string, alloc map[string]v`
`79`	`79`	`return nil`
`80`	`80`	`}`
`81`	`81`
`82`		`-func (s *stateMemory) deleteContainer(podUID string, containerName string) {`
	`82`	`+func (s *stateMemory) deleteContainer(podUID types.UID, containerName string) {`
`83`	`83`	`delete(s.podAllocation[podUID], containerName)`
`84`	`84`	`if len(s.podAllocation[podUID]) == 0 {`
`85`	`85`	`delete(s.podAllocation, podUID)`
`86`	`86`	`}`
`87`	`87`	`klog.V(3).InfoS("Deleted pod resource allocation", "podUID", podUID, "containerName", containerName)`
`88`	`88`	`}`
`89`	`89`
`90`		`-func (s *stateMemory) Delete(podUID string, containerName string) error {`
	`90`	`+func (s *stateMemory) Delete(podUID types.UID, containerName string) error {`
`91`	`91`	`s.Lock()`
`92`	`92`	`defer s.Unlock()`
`93`	`93`	`if len(containerName) == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -2575,11 +2575,11 @@ func TestPodResourceAllocationReset(t *testing.T) {`
`2575`	`2575`	`}`
`2576`	`2576`	`kubelet.HandlePodAdditions([]*v1.Pod{tc.pod})`
`2577`	`2577`
`2578`		`- allocatedResources, found := kubelet.allocationManager.GetContainerResourceAllocation(string(tc.pod.UID), tc.pod.Spec.Containers[0].Name)`
	`2578`	`+ allocatedResources, found := kubelet.allocationManager.GetContainerResourceAllocation(tc.pod.UID, tc.pod.Spec.Containers[0].Name)`
`2579`	`2579`	`if !found {`
`2580`	`2580`	`t.Fatalf("resource allocation should exist: (pod: %#v, container: %s)", tc.pod, tc.pod.Spec.Containers[0].Name)`
`2581`	`2581`	`}`
`2582`		`- assert.Equal(t, tc.expectedPodResourceAllocation[string(tc.pod.UID)][tc.pod.Spec.Containers[0].Name], allocatedResources, tc.name)`
	`2582`	`+ assert.Equal(t, tc.expectedPodResourceAllocation[tc.pod.UID][tc.pod.Spec.Containers[0].Name], allocatedResources, tc.name)`
`2583`	`2583`	`})`
`2584`	`2584`	`}`
`2585`	`2585`	`}`
`@@ -2949,7 +2949,7 @@ func TestHandlePodResourcesResize(t *testing.T) {`
`2949`	`2949`	`assert.Equal(t, tt.expectedAllocatedReqs, updatedPodCtr.Resources.Requests, "updated pod spec requests")`
`2950`	`2950`	`assert.Equal(t, tt.expectedAllocatedLims, updatedPodCtr.Resources.Limits, "updated pod spec limits")`
`2951`	`2951`
`2952`		`- alloc, found := kubelet.allocationManager.GetContainerResourceAllocation(string(newPod.UID), updatedPodCtr.Name)`
	`2952`	`+ alloc, found := kubelet.allocationManager.GetContainerResourceAllocation(newPod.UID, updatedPodCtr.Name)`
`2953`	`2953`	`require.True(t, found, "container allocation")`
`2954`	`2954`	`assert.Equal(t, tt.expectedAllocatedReqs, alloc.Requests, "stored container request allocation")`
`2955`	`2955`	`assert.Equal(t, tt.expectedAllocatedLims, alloc.Limits, "stored container limit allocation")`