upstream/kubernetes
1
0
Fork 0
mirror of https://github.com/kubernetes/kubernetes.git synced 2026-05-28 04:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #136226 from HirazawaUi/fix-kubelet-race-3

Browse source 
Fix data race in kubelet pod allocated resources
This commit is contained in:
Kubernetes Prow Robot 2026-01-28 22:17:49 +05:30 committed by GitHub
commit 4ffc49fb3e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkg/kubelet/kubelet_pods.go
View file

@ -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{}
}