mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-07-18 04:54:54 +00:00
Merge pull request #136226 from HirazawaUi/fix-kubelet-race-3
Fix data race in kubelet pod allocated resources
This commit is contained in:
@@ -2154,7 +2154,7 @@ func (kl *Kubelet) convertStatusToAPIStatus(ctx context.Context, pod *v1.Pod, po
|
||||
}
|
||||
|
||||
func getEffectiveAllocatedResources(allocatedPod *v1.Pod) *v1.ResourceRequirements {
|
||||
allocatedResources := allocatedPod.Spec.Resources
|
||||
allocatedResources := allocatedPod.Spec.Resources.DeepCopy()
|
||||
if allocatedResources == nil {
|
||||
allocatedResources = &v1.ResourceRequirements{}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user