github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130413 from zhifei92/deprecated-pointer

Browse Source 
chore(kubelet): Use ptr.To to replace the custom function unit64Ptr
This commit is contained in:
Kubernetes Prow Robot 2025-03-03 14:29:49 -08:00 committed by GitHub
commit 90cf6f2efe
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
pkg/kubelet/images/image_gc_manager_test.go
View File

@ -38,6 +38,7 @@ import (
stats "k8s.io/kubernetes/pkg/kubelet/server/stats" stats "k8s.io/kubernetes/pkg/kubelet/server/stats"
statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing" statstest "k8s.io/kubernetes/pkg/kubelet/server/stats/testing"
testingclock "k8s.io/utils/clock/testing" testingclock "k8s.io/utils/clock/testing"
"k8s.io/utils/ptr"
) )
var zero time.Time var zero time.Time
@ -626,8 +627,8 @@ func TestGarbageCollectBelowLowThreshold(t *testing.T) {
// Expect 40% usage. // Expect 40% usage.
imageStats := &statsapi.FsStats{ imageStats := &statsapi.FsStats{
AvailableBytes: uint64Ptr(600), AvailableBytes: ptr.To(uint64(600)),
CapacityBytes: uint64Ptr(1000), CapacityBytes: ptr.To(uint64(1000)),
} }
mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageStats, imageStats, nil) mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageStats, imageStats, nil)
@ -659,8 +660,8 @@ func TestGarbageCollectBelowSuccess(t *testing.T) {
// Expect 95% usage and most of it gets freed. // Expect 95% usage and most of it gets freed.
imageFs := &statsapi.FsStats{ imageFs := &statsapi.FsStats{
AvailableBytes: uint64Ptr(50), AvailableBytes: ptr.To(uint64(50)),
CapacityBytes: uint64Ptr(1000), CapacityBytes: ptr.To(uint64(1000)),
} }
mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageFs, imageFs, nil) mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageFs, imageFs, nil)
fakeRuntime.ImageList = []container.Image{ fakeRuntime.ImageList = []container.Image{
@ -681,8 +682,8 @@ func TestGarbageCollectNotEnoughFreed(t *testing.T) {
// Expect 95% usage and little of it gets freed. // Expect 95% usage and little of it gets freed.
imageFs := &statsapi.FsStats{ imageFs := &statsapi.FsStats{
AvailableBytes: uint64Ptr(50), AvailableBytes: ptr.To(uint64(50)),
CapacityBytes: uint64Ptr(1000), CapacityBytes: ptr.To(uint64(1000)),
} }
mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageFs, imageFs, nil) mockStatsProvider.EXPECT().ImageFsStats(mock.Anything).Return(imageFs, imageFs, nil)
fakeRuntime.ImageList = []container.Image{ fakeRuntime.ImageList = []container.Image{
@ -916,7 +917,3 @@ func TestValidateImageGCPolicy(t *testing.T) {
} }
} }
} }
func uint64Ptr(i uint64) *uint64 {
return &i
}