diff --git a/pkg/kubelet/apis/config/fuzzer/fuzzer.go b/pkg/kubelet/apis/config/fuzzer/fuzzer.go index b00dd10bcb8..881296c3f70 100644 --- a/pkg/kubelet/apis/config/fuzzer/fuzzer.go +++ b/pkg/kubelet/apis/config/fuzzer/fuzzer.go @@ -113,7 +113,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} { obj.Logging.Format = "text" } obj.EnableSystemLogHandler = true - obj.MemoryThrottlingFactor = utilpointer.Float64Ptr(rand.Float64()) + obj.MemoryThrottlingFactor = utilpointer.Float64(rand.Float64()) obj.LocalStorageCapacityIsolation = true }, } diff --git a/pkg/kubelet/apis/config/v1beta1/defaults.go b/pkg/kubelet/apis/config/v1beta1/defaults.go index 018368d4e51..ebd91c3fd7f 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults.go @@ -54,7 +54,7 @@ func addDefaultingFuncs(scheme *kruntime.Scheme) error { func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfiguration) { if obj.EnableServer == nil { - obj.EnableServer = utilpointer.BoolPtr(true) + obj.EnableServer = utilpointer.Bool(true) } if obj.SyncFrequency == zeroDuration { obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute} @@ -72,10 +72,10 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.Port = ports.KubeletPort } if obj.Authentication.Anonymous.Enabled == nil { - obj.Authentication.Anonymous.Enabled = utilpointer.BoolPtr(false) + obj.Authentication.Anonymous.Enabled = utilpointer.Bool(false) } if obj.Authentication.Webhook.Enabled == nil { - obj.Authentication.Webhook.Enabled = utilpointer.BoolPtr(true) + obj.Authentication.Webhook.Enabled = utilpointer.Bool(true) } if obj.Authentication.Webhook.CacheTTL == zeroDuration { obj.Authentication.Webhook.CacheTTL = metav1.Duration{Duration: 2 * time.Minute} @@ -90,28 +90,28 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.Authorization.Webhook.CacheUnauthorizedTTL = metav1.Duration{Duration: 30 * time.Second} } if obj.RegistryPullQPS == nil { - obj.RegistryPullQPS = utilpointer.Int32Ptr(5) + obj.RegistryPullQPS = utilpointer.Int32(5) } if obj.RegistryBurst == 0 { obj.RegistryBurst = 10 } if obj.EventRecordQPS == nil { - obj.EventRecordQPS = utilpointer.Int32Ptr(5) + obj.EventRecordQPS = utilpointer.Int32(5) } if obj.EventBurst == 0 { obj.EventBurst = 10 } if obj.EnableDebuggingHandlers == nil { - obj.EnableDebuggingHandlers = utilpointer.BoolPtr(true) + obj.EnableDebuggingHandlers = utilpointer.Bool(true) } if obj.HealthzPort == nil { - obj.HealthzPort = utilpointer.Int32Ptr(10248) + obj.HealthzPort = utilpointer.Int32(10248) } if obj.HealthzBindAddress == "" { obj.HealthzBindAddress = "127.0.0.1" } if obj.OOMScoreAdj == nil { - obj.OOMScoreAdj = utilpointer.Int32Ptr(int32(qos.KubeletOOMScoreAdj)) + obj.OOMScoreAdj = utilpointer.Int32(int32(qos.KubeletOOMScoreAdj)) } if obj.StreamingConnectionIdleTimeout == zeroDuration { obj.StreamingConnectionIdleTimeout = metav1.Duration{Duration: 4 * time.Hour} @@ -137,16 +137,16 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura } if obj.ImageGCHighThresholdPercent == nil { // default is below docker's default dm.min_free_space of 90% - obj.ImageGCHighThresholdPercent = utilpointer.Int32Ptr(85) + obj.ImageGCHighThresholdPercent = utilpointer.Int32(85) } if obj.ImageGCLowThresholdPercent == nil { - obj.ImageGCLowThresholdPercent = utilpointer.Int32Ptr(80) + obj.ImageGCLowThresholdPercent = utilpointer.Int32(80) } if obj.VolumeStatsAggPeriod == zeroDuration { obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute} } if obj.CgroupsPerQOS == nil { - obj.CgroupsPerQOS = utilpointer.BoolPtr(true) + obj.CgroupsPerQOS = utilpointer.Bool(true) } if obj.CgroupDriver == "" { obj.CgroupDriver = "cgroupfs" @@ -185,13 +185,13 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.ResolverConfig = utilpointer.String(kubetypes.ResolvConfDefault) } if obj.CPUCFSQuota == nil { - obj.CPUCFSQuota = utilpointer.BoolPtr(true) + obj.CPUCFSQuota = utilpointer.Bool(true) } if obj.CPUCFSQuotaPeriod == nil { obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond} } if obj.NodeStatusMaxImages == nil { - obj.NodeStatusMaxImages = utilpointer.Int32Ptr(50) + obj.NodeStatusMaxImages = utilpointer.Int32(50) } if obj.MaxOpenFiles == 0 { obj.MaxOpenFiles = 1000000 @@ -200,37 +200,37 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura obj.ContentType = "application/vnd.kubernetes.protobuf" } if obj.KubeAPIQPS == nil { - obj.KubeAPIQPS = utilpointer.Int32Ptr(5) + obj.KubeAPIQPS = utilpointer.Int32(5) } if obj.KubeAPIBurst == 0 { obj.KubeAPIBurst = 10 } if obj.SerializeImagePulls == nil { - obj.SerializeImagePulls = utilpointer.BoolPtr(true) + obj.SerializeImagePulls = utilpointer.Bool(true) } if obj.EvictionPressureTransitionPeriod == zeroDuration { obj.EvictionPressureTransitionPeriod = metav1.Duration{Duration: 5 * time.Minute} } if obj.EnableControllerAttachDetach == nil { - obj.EnableControllerAttachDetach = utilpointer.BoolPtr(true) + obj.EnableControllerAttachDetach = utilpointer.Bool(true) } if obj.MakeIPTablesUtilChains == nil { - obj.MakeIPTablesUtilChains = utilpointer.BoolPtr(true) + obj.MakeIPTablesUtilChains = utilpointer.Bool(true) } if obj.IPTablesMasqueradeBit == nil { - obj.IPTablesMasqueradeBit = utilpointer.Int32Ptr(DefaultIPTablesMasqueradeBit) + obj.IPTablesMasqueradeBit = utilpointer.Int32(DefaultIPTablesMasqueradeBit) } if obj.IPTablesDropBit == nil { - obj.IPTablesDropBit = utilpointer.Int32Ptr(DefaultIPTablesDropBit) + obj.IPTablesDropBit = utilpointer.Int32(DefaultIPTablesDropBit) } if obj.FailSwapOn == nil { - obj.FailSwapOn = utilpointer.BoolPtr(true) + obj.FailSwapOn = utilpointer.Bool(true) } if obj.ContainerLogMaxSize == "" { obj.ContainerLogMaxSize = "10Mi" } if obj.ContainerLogMaxFiles == nil { - obj.ContainerLogMaxFiles = utilpointer.Int32Ptr(5) + obj.ContainerLogMaxFiles = utilpointer.Int32(5) } if obj.ConfigMapAndSecretChangeDetectionStrategy == "" { obj.ConfigMapAndSecretChangeDetectionStrategy = kubeletconfigv1beta1.WatchChangeDetectionStrategy @@ -244,25 +244,25 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura // Use the Default LoggingConfiguration option logsapi.SetRecommendedLoggingConfiguration(&obj.Logging) if obj.EnableSystemLogHandler == nil { - obj.EnableSystemLogHandler = utilpointer.BoolPtr(true) + obj.EnableSystemLogHandler = utilpointer.Bool(true) } if obj.EnableProfilingHandler == nil { - obj.EnableProfilingHandler = utilpointer.BoolPtr(true) + obj.EnableProfilingHandler = utilpointer.Bool(true) } if obj.EnableDebugFlagsHandler == nil { - obj.EnableDebugFlagsHandler = utilpointer.BoolPtr(true) + obj.EnableDebugFlagsHandler = utilpointer.Bool(true) } if obj.SeccompDefault == nil { - obj.SeccompDefault = utilpointer.BoolPtr(false) + obj.SeccompDefault = utilpointer.Bool(false) } if obj.MemoryThrottlingFactor == nil { - obj.MemoryThrottlingFactor = utilpointer.Float64Ptr(DefaultMemoryThrottlingFactor) + obj.MemoryThrottlingFactor = utilpointer.Float64(DefaultMemoryThrottlingFactor) } if obj.RegisterNode == nil { - obj.RegisterNode = utilpointer.BoolPtr(true) + obj.RegisterNode = utilpointer.Bool(true) } if obj.LocalStorageCapacityIsolation == nil { - obj.LocalStorageCapacityIsolation = utilpointer.BoolPtr(true) + obj.LocalStorageCapacityIsolation = utilpointer.Bool(true) } if obj.ContainerRuntimeEndpoint == "" { obj.ContainerRuntimeEndpoint = "unix:///run/containerd/containerd.sock" diff --git a/pkg/kubelet/apis/config/v1beta1/defaults_test.go b/pkg/kubelet/apis/config/v1beta1/defaults_test.go index 6c01d476730..079869a0721 100644 --- a/pkg/kubelet/apis/config/v1beta1/defaults_test.go +++ b/pkg/kubelet/apis/config/v1beta1/defaults_test.go @@ -43,16 +43,16 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { "empty config", &v1beta1.KubeletConfiguration{}, &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(true), + EnableServer: utilpointer.Bool(true), SyncFrequency: metav1.Duration{Duration: 1 * time.Minute}, FileCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, HTTPCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, Address: "0.0.0.0", Port: ports.KubeletPort, Authentication: v1beta1.KubeletAuthentication{ - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(false)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(false)}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(true), + Enabled: utilpointer.Bool(true), CacheTTL: metav1.Duration{Duration: 2 * time.Minute}, }, }, @@ -63,24 +63,24 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { CacheUnauthorizedTTL: metav1.Duration{Duration: 30 * time.Second}, }, }, - RegistryPullQPS: utilpointer.Int32Ptr(5), + RegistryPullQPS: utilpointer.Int32(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32Ptr(5), + EventRecordQPS: utilpointer.Int32(5), EventBurst: 10, - EnableDebuggingHandlers: utilpointer.BoolPtr(true), - HealthzPort: utilpointer.Int32Ptr(10248), + EnableDebuggingHandlers: utilpointer.Bool(true), + HealthzPort: utilpointer.Int32(10248), HealthzBindAddress: "127.0.0.1", - OOMScoreAdj: utilpointer.Int32Ptr(int32(qos.KubeletOOMScoreAdj)), + OOMScoreAdj: utilpointer.Int32(int32(qos.KubeletOOMScoreAdj)), StreamingConnectionIdleTimeout: metav1.Duration{Duration: 4 * time.Hour}, NodeStatusUpdateFrequency: metav1.Duration{Duration: 10 * time.Second}, NodeStatusReportFrequency: metav1.Duration{Duration: 5 * time.Minute}, NodeLeaseDurationSeconds: 40, ImageMinimumGCAge: metav1.Duration{Duration: 2 * time.Minute}, - ImageGCHighThresholdPercent: utilpointer.Int32Ptr(85), - ImageGCLowThresholdPercent: utilpointer.Int32Ptr(80), + ImageGCHighThresholdPercent: utilpointer.Int32(85), + ImageGCLowThresholdPercent: utilpointer.Int32(80), ContainerRuntimeEndpoint: "unix:///run/containerd/containerd.sock", VolumeStatsAggPeriod: metav1.Duration{Duration: time.Minute}, - CgroupsPerQOS: utilpointer.BoolPtr(true), + CgroupsPerQOS: utilpointer.Bool(true), CgroupDriver: "cgroupfs", CPUManagerPolicy: "none", CPUManagerReconcilePeriod: metav1.Duration{Duration: 10 * time.Second}, @@ -92,23 +92,23 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { MaxPods: 110, PodPidsLimit: utilpointer.Int64(-1), ResolverConfig: utilpointer.String(kubetypes.ResolvConfDefault), - CPUCFSQuota: utilpointer.BoolPtr(true), + CPUCFSQuota: utilpointer.Bool(true), CPUCFSQuotaPeriod: &metav1.Duration{Duration: 100 * time.Millisecond}, - NodeStatusMaxImages: utilpointer.Int32Ptr(50), + NodeStatusMaxImages: utilpointer.Int32(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32Ptr(5), + KubeAPIQPS: utilpointer.Int32(5), KubeAPIBurst: 10, - SerializeImagePulls: utilpointer.BoolPtr(true), + SerializeImagePulls: utilpointer.Bool(true), EvictionHard: nil, EvictionPressureTransitionPeriod: metav1.Duration{Duration: 5 * time.Minute}, - EnableControllerAttachDetach: utilpointer.BoolPtr(true), - MakeIPTablesUtilChains: utilpointer.BoolPtr(true), - IPTablesMasqueradeBit: utilpointer.Int32Ptr(DefaultIPTablesMasqueradeBit), - IPTablesDropBit: utilpointer.Int32Ptr(DefaultIPTablesDropBit), - FailSwapOn: utilpointer.BoolPtr(true), + EnableControllerAttachDetach: utilpointer.Bool(true), + MakeIPTablesUtilChains: utilpointer.Bool(true), + IPTablesMasqueradeBit: utilpointer.Int32(DefaultIPTablesMasqueradeBit), + IPTablesDropBit: utilpointer.Int32(DefaultIPTablesDropBit), + FailSwapOn: utilpointer.Bool(true), ContainerLogMaxSize: "10Mi", - ContainerLogMaxFiles: utilpointer.Int32Ptr(5), + ContainerLogMaxFiles: utilpointer.Int32(5), ConfigMapAndSecretChangeDetectionStrategy: v1beta1.WatchChangeDetectionStrategy, EnforceNodeAllocatable: DefaultNodeAllocatableEnforcement, VolumePluginDir: DefaultVolumePluginDir, @@ -116,19 +116,19 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Format: "text", FlushFrequency: 5 * time.Second, }, - EnableSystemLogHandler: utilpointer.BoolPtr(true), - EnableProfilingHandler: utilpointer.BoolPtr(true), - EnableDebugFlagsHandler: utilpointer.BoolPtr(true), - SeccompDefault: utilpointer.BoolPtr(false), - MemoryThrottlingFactor: utilpointer.Float64Ptr(DefaultMemoryThrottlingFactor), - RegisterNode: utilpointer.BoolPtr(true), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(true), + EnableSystemLogHandler: utilpointer.Bool(true), + EnableProfilingHandler: utilpointer.Bool(true), + EnableDebugFlagsHandler: utilpointer.Bool(true), + SeccompDefault: utilpointer.Bool(false), + MemoryThrottlingFactor: utilpointer.Float64(DefaultMemoryThrottlingFactor), + RegisterNode: utilpointer.Bool(true), + LocalStorageCapacityIsolation: utilpointer.Bool(true), }, }, { "all negative", &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(false), + EnableServer: utilpointer.Bool(false), StaticPodPath: "", SyncFrequency: zeroDuration, FileCheckFrequency: zeroDuration, @@ -147,10 +147,10 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Authentication: v1beta1.KubeletAuthentication{ X509: v1beta1.KubeletX509Authentication{ClientCAFile: ""}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(false), + Enabled: utilpointer.Bool(false), CacheTTL: zeroDuration, }, - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(false)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(false)}, }, Authorization: v1beta1.KubeletAuthorization{ Mode: v1beta1.KubeletAuthorizationModeWebhook, @@ -163,7 +163,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { RegistryBurst: 0, EventRecordQPS: utilpointer.Int32(0), EventBurst: 0, - EnableDebuggingHandlers: utilpointer.BoolPtr(false), + EnableDebuggingHandlers: utilpointer.Bool(false), EnableContentionProfiling: false, HealthzPort: utilpointer.Int32(0), HealthzBindAddress: "", @@ -182,7 +182,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { KubeletCgroups: "", SystemCgroups: "", CgroupRoot: "", - CgroupsPerQOS: utilpointer.BoolPtr(false), + CgroupsPerQOS: utilpointer.Bool(false), CgroupDriver: "", CPUManagerPolicy: "", CPUManagerPolicyOptions: map[string]string{}, @@ -247,11 +247,11 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { EnableDebugFlagsHandler: utilpointer.Bool(false), SeccompDefault: utilpointer.Bool(false), MemoryThrottlingFactor: utilpointer.Float64(0), - RegisterNode: utilpointer.BoolPtr(false), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(false), + RegisterNode: utilpointer.Bool(false), + LocalStorageCapacityIsolation: utilpointer.Bool(false), }, &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(false), + EnableServer: utilpointer.Bool(false), SyncFrequency: metav1.Duration{Duration: 1 * time.Minute}, FileCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, HTTPCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, @@ -262,10 +262,10 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Authentication: v1beta1.KubeletAuthentication{ X509: v1beta1.KubeletX509Authentication{ClientCAFile: ""}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(false), + Enabled: utilpointer.Bool(false), CacheTTL: metav1.Duration{Duration: 2 * time.Minute}, }, - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(false)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(false)}, }, Authorization: v1beta1.KubeletAuthorization{ Mode: v1beta1.KubeletAuthorizationModeWebhook, @@ -278,7 +278,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { RegistryBurst: 10, EventRecordQPS: utilpointer.Int32(0), EventBurst: 10, - EnableDebuggingHandlers: utilpointer.BoolPtr(false), + EnableDebuggingHandlers: utilpointer.Bool(false), HealthzPort: utilpointer.Int32(0), HealthzBindAddress: "127.0.0.1", OOMScoreAdj: utilpointer.Int32(0), @@ -292,7 +292,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { ImageGCHighThresholdPercent: utilpointer.Int32(0), ImageGCLowThresholdPercent: utilpointer.Int32(0), VolumeStatsAggPeriod: metav1.Duration{Duration: time.Minute}, - CgroupsPerQOS: utilpointer.BoolPtr(false), + CgroupsPerQOS: utilpointer.Bool(false), CgroupDriver: "cgroupfs", CPUManagerPolicy: "none", CPUManagerPolicyOptions: map[string]string{}, @@ -344,14 +344,14 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { EnableDebugFlagsHandler: utilpointer.Bool(false), SeccompDefault: utilpointer.Bool(false), MemoryThrottlingFactor: utilpointer.Float64(0), - RegisterNode: utilpointer.BoolPtr(false), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(false), + RegisterNode: utilpointer.Bool(false), + LocalStorageCapacityIsolation: utilpointer.Bool(false), }, }, { "all positive", &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(true), + EnableServer: utilpointer.Bool(true), StaticPodPath: "static/pod/path", SyncFrequency: metav1.Duration{Duration: 60 * time.Second}, FileCheckFrequency: metav1.Duration{Duration: 60 * time.Second}, @@ -370,10 +370,10 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Authentication: v1beta1.KubeletAuthentication{ X509: v1beta1.KubeletX509Authentication{ClientCAFile: "client-ca-file"}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(true), + Enabled: utilpointer.Bool(true), CacheTTL: metav1.Duration{Duration: 60 * time.Second}, }, - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(true)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(true)}, }, Authorization: v1beta1.KubeletAuthorization{ Mode: v1beta1.KubeletAuthorizationModeAlwaysAllow, @@ -386,7 +386,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { RegistryBurst: 1, EventRecordQPS: utilpointer.Int32(1), EventBurst: 1, - EnableDebuggingHandlers: utilpointer.BoolPtr(true), + EnableDebuggingHandlers: utilpointer.Bool(true), EnableContentionProfiling: true, HealthzPort: utilpointer.Int32(1), HealthzBindAddress: "127.0.0.2", @@ -405,7 +405,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { KubeletCgroups: "kubelet-cgroup", SystemCgroups: "system-cgroup", CgroupRoot: "root-cgroup", - CgroupsPerQOS: utilpointer.BoolPtr(true), + CgroupsPerQOS: utilpointer.Bool(true), CgroupDriver: "systemd", CPUManagerPolicy: "cpu-manager-policy", CPUManagerPolicyOptions: map[string]string{"key": "value"}, @@ -492,11 +492,11 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { EnableDebugFlagsHandler: utilpointer.Bool(true), SeccompDefault: utilpointer.Bool(true), MemoryThrottlingFactor: utilpointer.Float64(1), - RegisterNode: utilpointer.BoolPtr(true), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(true), + RegisterNode: utilpointer.Bool(true), + LocalStorageCapacityIsolation: utilpointer.Bool(true), }, &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(true), + EnableServer: utilpointer.Bool(true), StaticPodPath: "static/pod/path", SyncFrequency: metav1.Duration{Duration: 60 * time.Second}, FileCheckFrequency: metav1.Duration{Duration: 60 * time.Second}, @@ -515,10 +515,10 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Authentication: v1beta1.KubeletAuthentication{ X509: v1beta1.KubeletX509Authentication{ClientCAFile: "client-ca-file"}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(true), + Enabled: utilpointer.Bool(true), CacheTTL: metav1.Duration{Duration: 60 * time.Second}, }, - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(true)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(true)}, }, Authorization: v1beta1.KubeletAuthorization{ Mode: v1beta1.KubeletAuthorizationModeAlwaysAllow, @@ -531,7 +531,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { RegistryBurst: 1, EventRecordQPS: utilpointer.Int32(1), EventBurst: 1, - EnableDebuggingHandlers: utilpointer.BoolPtr(true), + EnableDebuggingHandlers: utilpointer.Bool(true), EnableContentionProfiling: true, HealthzPort: utilpointer.Int32(1), HealthzBindAddress: "127.0.0.2", @@ -550,7 +550,7 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { KubeletCgroups: "kubelet-cgroup", SystemCgroups: "system-cgroup", CgroupRoot: "root-cgroup", - CgroupsPerQOS: utilpointer.BoolPtr(true), + CgroupsPerQOS: utilpointer.Bool(true), CgroupDriver: "systemd", CPUManagerPolicy: "cpu-manager-policy", CPUManagerPolicyOptions: map[string]string{"key": "value"}, @@ -637,8 +637,8 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { EnableDebugFlagsHandler: utilpointer.Bool(true), SeccompDefault: utilpointer.Bool(true), MemoryThrottlingFactor: utilpointer.Float64(1), - RegisterNode: utilpointer.BoolPtr(true), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(true), + RegisterNode: utilpointer.Bool(true), + LocalStorageCapacityIsolation: utilpointer.Bool(true), }, }, { @@ -647,16 +647,16 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { NodeStatusUpdateFrequency: metav1.Duration{Duration: 1 * time.Minute}, }, &v1beta1.KubeletConfiguration{ - EnableServer: utilpointer.BoolPtr(true), + EnableServer: utilpointer.Bool(true), SyncFrequency: metav1.Duration{Duration: 1 * time.Minute}, FileCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, HTTPCheckFrequency: metav1.Duration{Duration: 20 * time.Second}, Address: "0.0.0.0", Port: ports.KubeletPort, Authentication: v1beta1.KubeletAuthentication{ - Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.BoolPtr(false)}, + Anonymous: v1beta1.KubeletAnonymousAuthentication{Enabled: utilpointer.Bool(false)}, Webhook: v1beta1.KubeletWebhookAuthentication{ - Enabled: utilpointer.BoolPtr(true), + Enabled: utilpointer.Bool(true), CacheTTL: metav1.Duration{Duration: 2 * time.Minute}, }, }, @@ -667,24 +667,24 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { CacheUnauthorizedTTL: metav1.Duration{Duration: 30 * time.Second}, }, }, - RegistryPullQPS: utilpointer.Int32Ptr(5), + RegistryPullQPS: utilpointer.Int32(5), RegistryBurst: 10, - EventRecordQPS: utilpointer.Int32Ptr(5), + EventRecordQPS: utilpointer.Int32(5), EventBurst: 10, - EnableDebuggingHandlers: utilpointer.BoolPtr(true), - HealthzPort: utilpointer.Int32Ptr(10248), + EnableDebuggingHandlers: utilpointer.Bool(true), + HealthzPort: utilpointer.Int32(10248), HealthzBindAddress: "127.0.0.1", - OOMScoreAdj: utilpointer.Int32Ptr(int32(qos.KubeletOOMScoreAdj)), + OOMScoreAdj: utilpointer.Int32(int32(qos.KubeletOOMScoreAdj)), StreamingConnectionIdleTimeout: metav1.Duration{Duration: 4 * time.Hour}, NodeStatusUpdateFrequency: metav1.Duration{Duration: 1 * time.Minute}, NodeStatusReportFrequency: metav1.Duration{Duration: 1 * time.Minute}, NodeLeaseDurationSeconds: 40, ContainerRuntimeEndpoint: "unix:///run/containerd/containerd.sock", ImageMinimumGCAge: metav1.Duration{Duration: 2 * time.Minute}, - ImageGCHighThresholdPercent: utilpointer.Int32Ptr(85), - ImageGCLowThresholdPercent: utilpointer.Int32Ptr(80), + ImageGCHighThresholdPercent: utilpointer.Int32(85), + ImageGCLowThresholdPercent: utilpointer.Int32(80), VolumeStatsAggPeriod: metav1.Duration{Duration: time.Minute}, - CgroupsPerQOS: utilpointer.BoolPtr(true), + CgroupsPerQOS: utilpointer.Bool(true), CgroupDriver: "cgroupfs", CPUManagerPolicy: "none", CPUManagerReconcilePeriod: metav1.Duration{Duration: 10 * time.Second}, @@ -696,23 +696,23 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { MaxPods: 110, PodPidsLimit: utilpointer.Int64(-1), ResolverConfig: utilpointer.String(kubetypes.ResolvConfDefault), - CPUCFSQuota: utilpointer.BoolPtr(true), + CPUCFSQuota: utilpointer.Bool(true), CPUCFSQuotaPeriod: &metav1.Duration{Duration: 100 * time.Millisecond}, - NodeStatusMaxImages: utilpointer.Int32Ptr(50), + NodeStatusMaxImages: utilpointer.Int32(50), MaxOpenFiles: 1000000, ContentType: "application/vnd.kubernetes.protobuf", - KubeAPIQPS: utilpointer.Int32Ptr(5), + KubeAPIQPS: utilpointer.Int32(5), KubeAPIBurst: 10, - SerializeImagePulls: utilpointer.BoolPtr(true), + SerializeImagePulls: utilpointer.Bool(true), EvictionHard: nil, EvictionPressureTransitionPeriod: metav1.Duration{Duration: 5 * time.Minute}, - EnableControllerAttachDetach: utilpointer.BoolPtr(true), - MakeIPTablesUtilChains: utilpointer.BoolPtr(true), - IPTablesMasqueradeBit: utilpointer.Int32Ptr(DefaultIPTablesMasqueradeBit), - IPTablesDropBit: utilpointer.Int32Ptr(DefaultIPTablesDropBit), - FailSwapOn: utilpointer.BoolPtr(true), + EnableControllerAttachDetach: utilpointer.Bool(true), + MakeIPTablesUtilChains: utilpointer.Bool(true), + IPTablesMasqueradeBit: utilpointer.Int32(DefaultIPTablesMasqueradeBit), + IPTablesDropBit: utilpointer.Int32(DefaultIPTablesDropBit), + FailSwapOn: utilpointer.Bool(true), ContainerLogMaxSize: "10Mi", - ContainerLogMaxFiles: utilpointer.Int32Ptr(5), + ContainerLogMaxFiles: utilpointer.Int32(5), ConfigMapAndSecretChangeDetectionStrategy: v1beta1.WatchChangeDetectionStrategy, EnforceNodeAllocatable: DefaultNodeAllocatableEnforcement, VolumePluginDir: DefaultVolumePluginDir, @@ -720,13 +720,13 @@ func TestSetDefaultsKubeletConfiguration(t *testing.T) { Format: "text", FlushFrequency: 5 * time.Second, }, - EnableSystemLogHandler: utilpointer.BoolPtr(true), - EnableProfilingHandler: utilpointer.BoolPtr(true), - EnableDebugFlagsHandler: utilpointer.BoolPtr(true), - SeccompDefault: utilpointer.BoolPtr(false), - MemoryThrottlingFactor: utilpointer.Float64Ptr(DefaultMemoryThrottlingFactor), - RegisterNode: utilpointer.BoolPtr(true), - LocalStorageCapacityIsolation: utilpointer.BoolPtr(true), + EnableSystemLogHandler: utilpointer.Bool(true), + EnableProfilingHandler: utilpointer.Bool(true), + EnableDebugFlagsHandler: utilpointer.Bool(true), + SeccompDefault: utilpointer.Bool(false), + MemoryThrottlingFactor: utilpointer.Float64(DefaultMemoryThrottlingFactor), + RegisterNode: utilpointer.Bool(true), + LocalStorageCapacityIsolation: utilpointer.Bool(true), }, }, } diff --git a/pkg/kubelet/apis/config/validation/validation_test.go b/pkg/kubelet/apis/config/validation/validation_test.go index 71cd2bdddab..3df8179e216 100644 --- a/pkg/kubelet/apis/config/validation/validation_test.go +++ b/pkg/kubelet/apis/config/validation/validation_test.go @@ -64,7 +64,7 @@ var ( TopologyManagerPolicy: kubeletconfig.SingleNumaNodeTopologyManagerPolicy, ShutdownGracePeriod: metav1.Duration{Duration: 30 * time.Second}, ShutdownGracePeriodCriticalPods: metav1.Duration{Duration: 10 * time.Second}, - MemoryThrottlingFactor: utilpointer.Float64Ptr(0.8), + MemoryThrottlingFactor: utilpointer.Float64(0.8), FeatureGates: map[string]bool{ "CustomCPUCFSQuotaPeriod": true, "GracefulNodeShutdown": true, diff --git a/pkg/kubelet/cadvisor/cadvisor_linux.go b/pkg/kubelet/cadvisor/cadvisor_linux.go index 370e374df55..51e2380fe00 100644 --- a/pkg/kubelet/cadvisor/cadvisor_linux.go +++ b/pkg/kubelet/cadvisor/cadvisor_linux.go @@ -106,7 +106,7 @@ func New(imageFsInfoProvider ImageFsInfoProvider, rootPath string, cgroupRoots [ duration := maxHousekeepingInterval housekeepingConfig := manager.HouskeepingConfig{ Interval: &duration, - AllowDynamic: pointer.BoolPtr(allowDynamicHousekeeping), + AllowDynamic: pointer.Bool(allowDynamicHousekeeping), } // Create the cAdvisor container manager. diff --git a/pkg/kubelet/kuberuntime/helpers_linux_test.go b/pkg/kubelet/kuberuntime/helpers_linux_test.go index 2cfc09ca778..592ddd1b6f9 100644 --- a/pkg/kubelet/kuberuntime/helpers_linux_test.go +++ b/pkg/kubelet/kuberuntime/helpers_linux_test.go @@ -260,7 +260,7 @@ func TestFieldProfile(t *testing.T) { description: "SeccompProfileTypeLocalhost should return localhost", scmpProfile: &v1.SeccompProfile{ Type: v1.SeccompProfileTypeLocalhost, - LocalhostProfile: utilpointer.StringPtr("profile.json"), + LocalhostProfile: utilpointer.String("profile.json"), }, rootPath: "/test/", expectedProfile: "localhost//test/profile.json", @@ -316,7 +316,7 @@ func TestFieldProfileDefaultSeccomp(t *testing.T) { description: "SeccompProfileTypeLocalhost should return localhost", scmpProfile: &v1.SeccompProfile{ Type: v1.SeccompProfileTypeLocalhost, - LocalhostProfile: utilpointer.StringPtr("profile.json"), + LocalhostProfile: utilpointer.String("profile.json"), }, rootPath: "/test/", expectedProfile: "localhost//test/profile.json", diff --git a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go index 931733f2b08..890939ab30d 100644 --- a/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go +++ b/pkg/kubelet/kuberuntime/kuberuntime_sandbox_test.go @@ -119,8 +119,8 @@ func TestCreatePodSandbox_RuntimeClass(t *testing.T) { expectError bool }{ "unspecified RuntimeClass": {rcn: nil, expectedHandler: ""}, - "valid RuntimeClass": {rcn: pointer.StringPtr(rctest.SandboxRuntimeClass), expectedHandler: rctest.SandboxRuntimeHandler}, - "missing RuntimeClass": {rcn: pointer.StringPtr("phantom"), expectError: true}, + "valid RuntimeClass": {rcn: pointer.String(rctest.SandboxRuntimeClass), expectedHandler: rctest.SandboxRuntimeHandler}, + "missing RuntimeClass": {rcn: pointer.String("phantom"), expectError: true}, } for name, test := range tests { t.Run(name, func(t *testing.T) { diff --git a/pkg/kubelet/kuberuntime/logs/logs_test.go b/pkg/kubelet/kuberuntime/logs/logs_test.go index 98f5a49a779..965e1842ed5 100644 --- a/pkg/kubelet/kuberuntime/logs/logs_test.go +++ b/pkg/kubelet/kuberuntime/logs/logs_test.go @@ -98,42 +98,42 @@ func TestReadLogs(t *testing.T) { { name: "using TailLines 2 should output last 2 lines", podLogOptions: v1.PodLogOptions{ - TailLines: pointer.Int64Ptr(2), + TailLines: pointer.Int64(2), }, expected: "line2\nline3\n", }, { name: "using TailLines 4 should output all lines when the log has less than 4 lines", podLogOptions: v1.PodLogOptions{ - TailLines: pointer.Int64Ptr(4), + TailLines: pointer.Int64(4), }, expected: "line1\nline2\nline3\n", }, { name: "using TailLines 0 should output nothing", podLogOptions: v1.PodLogOptions{ - TailLines: pointer.Int64Ptr(0), + TailLines: pointer.Int64(0), }, expected: "", }, { name: "using LimitBytes 9 should output first 9 bytes", podLogOptions: v1.PodLogOptions{ - LimitBytes: pointer.Int64Ptr(9), + LimitBytes: pointer.Int64(9), }, expected: "line1\nlin", }, { name: "using LimitBytes 100 should output all bytes when the log has less than 100 bytes", podLogOptions: v1.PodLogOptions{ - LimitBytes: pointer.Int64Ptr(100), + LimitBytes: pointer.Int64(100), }, expected: "line1\nline2\nline3\n", }, { name: "using LimitBytes 0 should output nothing", podLogOptions: v1.PodLogOptions{ - LimitBytes: pointer.Int64Ptr(0), + LimitBytes: pointer.Int64(0), }, expected: "", }, @@ -162,7 +162,7 @@ func TestReadLogs(t *testing.T) { name: "using follow combined with TailLines 2 should output the last 2 lines", podLogOptions: v1.PodLogOptions{ Follow: true, - TailLines: pointer.Int64Ptr(2), + TailLines: pointer.Int64(2), }, expected: "line2\nline3\n", }, diff --git a/pkg/kubelet/pod/mirror_client_test.go b/pkg/kubelet/pod/mirror_client_test.go index f3d74cbbf7e..51c21d66825 100644 --- a/pkg/kubelet/pod/mirror_client_test.go +++ b/pkg/kubelet/pod/mirror_client_test.go @@ -137,7 +137,7 @@ func TestCreateMirrorPod(t *testing.T) { Kind: "Node", Name: testNodeName, UID: testNodeUID, - Controller: pointer.BoolPtr(true), + Controller: pointer.Bool(true), } assert.Equal(t, expectedOwnerRef, createdPod.OwnerReferences[0]) }) diff --git a/pkg/kubelet/runtimeclass/runtimeclass_manager_test.go b/pkg/kubelet/runtimeclass/runtimeclass_manager_test.go index 676128086db..977b03b2a93 100644 --- a/pkg/kubelet/runtimeclass/runtimeclass_manager_test.go +++ b/pkg/kubelet/runtimeclass/runtimeclass_manager_test.go @@ -33,10 +33,10 @@ func TestLookupRuntimeHandler(t *testing.T) { expected string expectError bool }{ - {rcn: pointer.StringPtr(""), expected: ""}, - {rcn: pointer.StringPtr(rctest.EmptyRuntimeClass), expected: ""}, - {rcn: pointer.StringPtr(rctest.SandboxRuntimeClass), expected: "kata-containers"}, - {rcn: pointer.StringPtr("phantom"), expectError: true}, + {rcn: pointer.String(""), expected: ""}, + {rcn: pointer.String(rctest.EmptyRuntimeClass), expected: ""}, + {rcn: pointer.String(rctest.SandboxRuntimeClass), expected: "kata-containers"}, + {rcn: pointer.String("phantom"), expectError: true}, } manager := runtimeclass.NewManager(rctest.NewPopulatedClient()) diff --git a/pkg/kubelet/server/server_test.go b/pkg/kubelet/server/server_test.go index 03969100c5c..34458a362e7 100644 --- a/pkg/kubelet/server/server_test.go +++ b/pkg/kubelet/server/server_test.go @@ -811,8 +811,8 @@ func TestContainerLogs(t *testing.T) { podLogOption *v1.PodLogOptions }{ "without tail": {"", &v1.PodLogOptions{}}, - "with tail": {"?tailLines=5", &v1.PodLogOptions{TailLines: pointer.Int64Ptr(5)}}, - "with legacy tail": {"?tail=5", &v1.PodLogOptions{TailLines: pointer.Int64Ptr(5)}}, + "with tail": {"?tailLines=5", &v1.PodLogOptions{TailLines: pointer.Int64(5)}}, + "with legacy tail": {"?tail=5", &v1.PodLogOptions{TailLines: pointer.Int64(5)}}, "with tail all": {"?tail=all", &v1.PodLogOptions{}}, "with follow": {"?follow=1", &v1.PodLogOptions{Follow: true}}, }