Skip to content

Commit 4eab3cc

Browse files
committed
use utils/ptr package instead of utils/pointer
Signed-off-by: sivchari <[email protected]>
1 parent 048c853 commit 4eab3cc

File tree

13 files changed

+332
-332
lines changed

13 files changed

+332
-332
lines changed

pkg/kubelet/apis/config/fuzzer/fuzzer.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import (
3131
"k8s.io/kubernetes/pkg/kubelet/eviction"
3232
"k8s.io/kubernetes/pkg/kubelet/qos"
3333
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
34-
utilpointer "k8s.io/utils/pointer"
34+
"k8s.io/utils/ptr"
3535
)
3636

3737
// Funcs returns the fuzzer functions for the kubeletconfig apis.
@@ -118,7 +118,7 @@ func Funcs(codecs runtimeserializer.CodecFactory) []interface{} {
118118
obj.Logging.Format = "text"
119119
}
120120
obj.EnableSystemLogHandler = true
121-
obj.MemoryThrottlingFactor = utilpointer.Float64(rand.Float64())
121+
obj.MemoryThrottlingFactor = ptr.To(rand.Float64())
122122
obj.LocalStorageCapacityIsolation = true
123123
},
124124
}

pkg/kubelet/apis/config/v1beta1/defaults.go

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/kubernetes/pkg/cluster/ports"
2929
"k8s.io/kubernetes/pkg/kubelet/qos"
3030
kubetypes "k8s.io/kubernetes/pkg/kubelet/types"
31-
utilpointer "k8s.io/utils/pointer"
31+
"k8s.io/utils/ptr"
3232
)
3333

3434
const (
@@ -54,7 +54,7 @@ func addDefaultingFuncs(scheme *kruntime.Scheme) error {
5454

5555
func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfiguration) {
5656
if obj.EnableServer == nil {
57-
obj.EnableServer = utilpointer.Bool(true)
57+
obj.EnableServer = ptr.To(true)
5858
}
5959
if obj.SyncFrequency == zeroDuration {
6060
obj.SyncFrequency = metav1.Duration{Duration: 1 * time.Minute}
@@ -72,10 +72,10 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
7272
obj.Port = ports.KubeletPort
7373
}
7474
if obj.Authentication.Anonymous.Enabled == nil {
75-
obj.Authentication.Anonymous.Enabled = utilpointer.Bool(false)
75+
obj.Authentication.Anonymous.Enabled = ptr.To(false)
7676
}
7777
if obj.Authentication.Webhook.Enabled == nil {
78-
obj.Authentication.Webhook.Enabled = utilpointer.Bool(true)
78+
obj.Authentication.Webhook.Enabled = ptr.To(true)
7979
}
8080
if obj.Authentication.Webhook.CacheTTL == zeroDuration {
8181
obj.Authentication.Webhook.CacheTTL = metav1.Duration{Duration: 2 * time.Minute}
@@ -90,28 +90,28 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
9090
obj.Authorization.Webhook.CacheUnauthorizedTTL = metav1.Duration{Duration: 30 * time.Second}
9191
}
9292
if obj.RegistryPullQPS == nil {
93-
obj.RegistryPullQPS = utilpointer.Int32(5)
93+
obj.RegistryPullQPS = ptr.To[int32](5)
9494
}
9595
if obj.RegistryBurst == 0 {
9696
obj.RegistryBurst = 10
9797
}
9898
if obj.EventRecordQPS == nil {
99-
obj.EventRecordQPS = utilpointer.Int32(50)
99+
obj.EventRecordQPS = ptr.To[int32](50)
100100
}
101101
if obj.EventBurst == 0 {
102102
obj.EventBurst = 100
103103
}
104104
if obj.EnableDebuggingHandlers == nil {
105-
obj.EnableDebuggingHandlers = utilpointer.Bool(true)
105+
obj.EnableDebuggingHandlers = ptr.To(true)
106106
}
107107
if obj.HealthzPort == nil {
108-
obj.HealthzPort = utilpointer.Int32(10248)
108+
obj.HealthzPort = ptr.To[int32](10248)
109109
}
110110
if obj.HealthzBindAddress == "" {
111111
obj.HealthzBindAddress = "127.0.0.1"
112112
}
113113
if obj.OOMScoreAdj == nil {
114-
obj.OOMScoreAdj = utilpointer.Int32(int32(qos.KubeletOOMScoreAdj))
114+
obj.OOMScoreAdj = ptr.To(int32(qos.KubeletOOMScoreAdj))
115115
}
116116
if obj.StreamingConnectionIdleTimeout == zeroDuration {
117117
obj.StreamingConnectionIdleTimeout = metav1.Duration{Duration: 4 * time.Hour}
@@ -137,16 +137,16 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
137137
}
138138
if obj.ImageGCHighThresholdPercent == nil {
139139
// default is below docker's default dm.min_free_space of 90%
140-
obj.ImageGCHighThresholdPercent = utilpointer.Int32(85)
140+
obj.ImageGCHighThresholdPercent = ptr.To[int32](85)
141141
}
142142
if obj.ImageGCLowThresholdPercent == nil {
143-
obj.ImageGCLowThresholdPercent = utilpointer.Int32(80)
143+
obj.ImageGCLowThresholdPercent = ptr.To[int32](80)
144144
}
145145
if obj.VolumeStatsAggPeriod == zeroDuration {
146146
obj.VolumeStatsAggPeriod = metav1.Duration{Duration: time.Minute}
147147
}
148148
if obj.CgroupsPerQOS == nil {
149-
obj.CgroupsPerQOS = utilpointer.Bool(true)
149+
obj.CgroupsPerQOS = ptr.To(true)
150150
}
151151
if obj.CgroupDriver == "" {
152152
obj.CgroupDriver = "cgroupfs"
@@ -178,20 +178,20 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
178178
}
179179
// default nil or negative value to -1 (implies node allocatable pid limit)
180180
if obj.PodPidsLimit == nil || *obj.PodPidsLimit < int64(0) {
181-
obj.PodPidsLimit = utilpointer.Int64(-1)
181+
obj.PodPidsLimit = ptr.To[int64](-1)
182182
}
183183

184184
if obj.ResolverConfig == nil {
185-
obj.ResolverConfig = utilpointer.String(kubetypes.ResolvConfDefault)
185+
obj.ResolverConfig = ptr.To(kubetypes.ResolvConfDefault)
186186
}
187187
if obj.CPUCFSQuota == nil {
188-
obj.CPUCFSQuota = utilpointer.Bool(true)
188+
obj.CPUCFSQuota = ptr.To(true)
189189
}
190190
if obj.CPUCFSQuotaPeriod == nil {
191191
obj.CPUCFSQuotaPeriod = &metav1.Duration{Duration: 100 * time.Millisecond}
192192
}
193193
if obj.NodeStatusMaxImages == nil {
194-
obj.NodeStatusMaxImages = utilpointer.Int32(50)
194+
obj.NodeStatusMaxImages = ptr.To[int32](50)
195195
}
196196
if obj.MaxOpenFiles == 0 {
197197
obj.MaxOpenFiles = 1000000
@@ -200,7 +200,7 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
200200
obj.ContentType = "application/vnd.kubernetes.protobuf"
201201
}
202202
if obj.KubeAPIQPS == nil {
203-
obj.KubeAPIQPS = utilpointer.Int32(50)
203+
obj.KubeAPIQPS = ptr.To[int32](50)
204204
}
205205
if obj.KubeAPIBurst == 0 {
206206
obj.KubeAPIBurst = 100
@@ -210,37 +210,37 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
210210
// is not set, and false when MaxParallelImagePulls is set.
211211
// This is to save users from having to set both configs.
212212
if obj.MaxParallelImagePulls == nil || *obj.MaxParallelImagePulls < 2 {
213-
obj.SerializeImagePulls = utilpointer.Bool(true)
213+
obj.SerializeImagePulls = ptr.To(true)
214214
} else {
215-
obj.SerializeImagePulls = utilpointer.Bool(false)
215+
obj.SerializeImagePulls = ptr.To(false)
216216
}
217217
}
218218
if obj.EvictionPressureTransitionPeriod == zeroDuration {
219219
obj.EvictionPressureTransitionPeriod = metav1.Duration{Duration: 5 * time.Minute}
220220
}
221221
if obj.EnableControllerAttachDetach == nil {
222-
obj.EnableControllerAttachDetach = utilpointer.Bool(true)
222+
obj.EnableControllerAttachDetach = ptr.To(true)
223223
}
224224
if obj.MakeIPTablesUtilChains == nil {
225-
obj.MakeIPTablesUtilChains = utilpointer.Bool(true)
225+
obj.MakeIPTablesUtilChains = ptr.To(true)
226226
}
227227
if obj.IPTablesMasqueradeBit == nil {
228-
obj.IPTablesMasqueradeBit = utilpointer.Int32(DefaultIPTablesMasqueradeBit)
228+
obj.IPTablesMasqueradeBit = ptr.To[int32](DefaultIPTablesMasqueradeBit)
229229
}
230230
if obj.IPTablesDropBit == nil {
231-
obj.IPTablesDropBit = utilpointer.Int32(DefaultIPTablesDropBit)
231+
obj.IPTablesDropBit = ptr.To[int32](DefaultIPTablesDropBit)
232232
}
233233
if obj.FailSwapOn == nil {
234-
obj.FailSwapOn = utilpointer.Bool(true)
234+
obj.FailSwapOn = ptr.To(true)
235235
}
236236
if obj.ContainerLogMaxSize == "" {
237237
obj.ContainerLogMaxSize = "10Mi"
238238
}
239239
if obj.ContainerLogMaxFiles == nil {
240-
obj.ContainerLogMaxFiles = utilpointer.Int32(5)
240+
obj.ContainerLogMaxFiles = ptr.To[int32](5)
241241
}
242242
if obj.ContainerLogMaxWorkers == nil {
243-
obj.ContainerLogMaxWorkers = utilpointer.Int32(1)
243+
obj.ContainerLogMaxWorkers = ptr.To[int32](1)
244244
}
245245
if obj.ContainerLogMonitorInterval == nil {
246246
obj.ContainerLogMonitorInterval = &metav1.Duration{Duration: 10 * time.Second}
@@ -257,28 +257,28 @@ func SetDefaults_KubeletConfiguration(obj *kubeletconfigv1beta1.KubeletConfigura
257257
// Use the Default LoggingConfiguration option
258258
logsapi.SetRecommendedLoggingConfiguration(&obj.Logging)
259259
if obj.EnableSystemLogHandler == nil {
260-
obj.EnableSystemLogHandler = utilpointer.Bool(true)
260+
obj.EnableSystemLogHandler = ptr.To(true)
261261
}
262262
if obj.EnableProfilingHandler == nil {
263-
obj.EnableProfilingHandler = utilpointer.Bool(true)
263+
obj.EnableProfilingHandler = ptr.To(true)
264264
}
265265
if obj.EnableDebugFlagsHandler == nil {
266-
obj.EnableDebugFlagsHandler = utilpointer.Bool(true)
266+
obj.EnableDebugFlagsHandler = ptr.To(true)
267267
}
268268
if obj.SeccompDefault == nil {
269-
obj.SeccompDefault = utilpointer.Bool(false)
269+
obj.SeccompDefault = ptr.To(false)
270270
}
271271
if obj.FailCgroupV1 == nil {
272-
obj.FailCgroupV1 = utilpointer.Bool(false)
272+
obj.FailCgroupV1 = ptr.To(false)
273273
}
274274
if obj.MemoryThrottlingFactor == nil {
275-
obj.MemoryThrottlingFactor = utilpointer.Float64(DefaultMemoryThrottlingFactor)
275+
obj.MemoryThrottlingFactor = ptr.To(DefaultMemoryThrottlingFactor)
276276
}
277277
if obj.RegisterNode == nil {
278-
obj.RegisterNode = utilpointer.Bool(true)
278+
obj.RegisterNode = ptr.To(true)
279279
}
280280
if obj.LocalStorageCapacityIsolation == nil {
281-
obj.LocalStorageCapacityIsolation = utilpointer.Bool(true)
281+
obj.LocalStorageCapacityIsolation = ptr.To(true)
282282
}
283283
if obj.ContainerRuntimeEndpoint == "" {
284284
obj.ContainerRuntimeEndpoint = "unix:///run/containerd/containerd.sock"

0 commit comments

Comments
 (0)