github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #98261 from wzshiming/fix-panic

Browse Source 
kubelet: Fix NPE in ephemeral storage eviction
This commit is contained in:
Kubernetes Prow Robot 2021-01-28 17:00:32 -08:00 committed by GitHub
commit 1a76d3ddfd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/eviction/eviction_manager.go
View File

@ -509,7 +509,7 @@ func (m *managerImpl) podEphemeralStorageLimitEviction(podStats statsapi.PodStat
// pod stats api summarizes ephemeral storage usage (container, emptyDir, host[etc-hosts, logs]) // pod stats api summarizes ephemeral storage usage (container, emptyDir, host[etc-hosts, logs])
podEphemeralStorageTotalUsage := &resource.Quantity{} podEphemeralStorageTotalUsage := &resource.Quantity{}
if podStats.EphemeralStorage != nil { if podStats.EphemeralStorage != nil && podStats.EphemeralStorage.UsedBytes != nil {
podEphemeralStorageTotalUsage = resource.NewQuantity(int64(*podStats.EphemeralStorage.UsedBytes), resource.BinarySI) podEphemeralStorageTotalUsage = resource.NewQuantity(int64(*podStats.EphemeralStorage.UsedBytes), resource.BinarySI)
} }
podEphemeralStorageLimit := podLimits[v1.ResourceEphemeralStorage] podEphemeralStorageLimit := podLimits[v1.ResourceEphemeralStorage]