Skip to content

Commit edb9f7a

Browse files
liangyuanpeng08AHAD
liangyuanpeng
authored and
08AHAD
committed
cleanup pointer, use ptr.Toto obtain a pointer, ptr.Deref to dereference a pointer.
The new k8s.io/utils/ptr package provides generic wrapper functions, which can be used instead of type-specific pointer wrapper functions. This replaces the latter with the former, and migrates other uses of the deprecated pointer package to ptr in affacted files. See kubernetes/utils#283 for details. Signed-off-by: Lan Liang <[email protected]> Signed-off-by: 08AHAD <[email protected]>
1 parent a105a2f commit edb9f7a

38 files changed

+208
-208
lines changed

‎examples/customresourceinterpreter/webhook/app/workloadwebhook.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"k8s.io/apimachinery/pkg/runtime"
2626
"k8s.io/klog/v2"
27-
"k8s.io/utils/pointer"
27+
"k8s.io/utils/ptr"
2828

2929
workloadv1alpha1 "github.com/karmada-io/karmada/examples/customresourceinterpreter/apis/workload/v1alpha1"
3030
configv1alpha1 "github.com/karmada-io/karmada/pkg/apis/config/v1alpha1"
@@ -142,9 +142,9 @@ func (e *workloadInterpreter) responseWithExploreAggregateStatus(workload *workl
142142
}
143143

144144
func (e *workloadInterpreter) responseWithExploreInterpretHealth(workload *workloadv1alpha1.Workload) interpreter.Response {
145-
healthy := pointer.Bool(false)
145+
healthy := ptr.To[bool](false)
146146
if workload.Status.ReadyReplicas == *workload.Spec.Replicas {
147-
healthy = pointer.Bool(true)
147+
healthy = ptr.To[bool](true)
148148
}
149149

150150
res := interpreter.Succeeded("")

‎operator/pkg/apis/operator/v1alpha1/defaults.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
corev1 "k8s.io/api/core/v1"
2323
"k8s.io/apimachinery/pkg/runtime"
2424
"k8s.io/klog/v2"
25-
"k8s.io/utils/pointer"
25+
"k8s.io/utils/ptr"
2626

2727
"github.com/karmada-io/karmada/operator/pkg/constants"
2828
"github.com/karmada-io/karmada/pkg/version"
@@ -103,7 +103,7 @@ func setDefaultsHostCluster(obj *Karmada) {
103103
hc.Networking = &Networking{}
104104
}
105105
if hc.Networking.DNSDomain == nil {
106-
hc.Networking.DNSDomain = pointer.String(constants.KarmadaDefaultDNSDomain)
106+
hc.Networking.DNSDomain = ptr.To[string](constants.KarmadaDefaultDNSDomain)
107107
}
108108
}
109109

@@ -118,7 +118,7 @@ func setDefaultsEtcd(obj *KarmadaComponents) {
118118
}
119119

120120
if obj.Etcd.Local.Replicas == nil {
121-
obj.Etcd.Local.Replicas = pointer.Int32(1)
121+
obj.Etcd.Local.Replicas = ptr.To[int32](1)
122122
}
123123
if len(obj.Etcd.Local.Image.ImageRepository) == 0 {
124124
obj.Etcd.Local.Image.ImageRepository = etcdImageRepository
@@ -154,10 +154,10 @@ func setDefaultsKarmadaAPIServer(obj *KarmadaComponents) {
154154
apiserver.ImagePullPolicy = corev1.PullIfNotPresent
155155
}
156156
if apiserver.Replicas == nil {
157-
apiserver.Replicas = pointer.Int32(1)
157+
apiserver.Replicas = ptr.To[int32](1)
158158
}
159159
if apiserver.ServiceSubnet == nil {
160-
apiserver.ServiceSubnet = pointer.String(constants.KarmadaDefaultServiceSubnet)
160+
apiserver.ServiceSubnet = ptr.To[string](constants.KarmadaDefaultServiceSubnet)
161161
}
162162
if len(apiserver.ServiceType) == 0 {
163163
apiserver.ServiceType = corev1.ServiceTypeClusterIP
@@ -180,7 +180,7 @@ func setDefaultsKarmadaAggregatedAPIServer(obj *KarmadaComponents) {
180180
aggregated.ImagePullPolicy = corev1.PullIfNotPresent
181181
}
182182
if aggregated.Replicas == nil {
183-
aggregated.Replicas = pointer.Int32(1)
183+
aggregated.Replicas = ptr.To[int32](1)
184184
}
185185
}
186186

@@ -200,7 +200,7 @@ func setDefaultsKubeControllerManager(obj *KarmadaComponents) {
200200
kubeControllerManager.ImagePullPolicy = corev1.PullIfNotPresent
201201
}
202202
if kubeControllerManager.Replicas == nil {
203-
kubeControllerManager.Replicas = pointer.Int32(1)
203+
kubeControllerManager.Replicas = ptr.To[int32](1)
204204
}
205205
}
206206

@@ -220,7 +220,7 @@ func setDefaultsKarmadaControllerManager(obj *KarmadaComponents) {
220220
karmadaControllerManager.ImagePullPolicy = corev1.PullIfNotPresent
221221
}
222222
if karmadaControllerManager.Replicas == nil {
223-
karmadaControllerManager.Replicas = pointer.Int32(1)
223+
karmadaControllerManager.Replicas = ptr.To[int32](1)
224224
}
225225
}
226226

@@ -240,7 +240,7 @@ func setDefaultsKarmadaScheduler(obj *KarmadaComponents) {
240240
scheduler.ImagePullPolicy = corev1.PullIfNotPresent
241241
}
242242
if scheduler.Replicas == nil {
243-
scheduler.Replicas = pointer.Int32(1)
243+
scheduler.Replicas = ptr.To[int32](1)
244244
}
245245
}
246246

@@ -260,7 +260,7 @@ func setDefaultsKarmadaWebhook(obj *KarmadaComponents) {
260260
webhook.ImagePullPolicy = corev1.PullIfNotPresent
261261
}
262262
if webhook.Replicas == nil {
263-
webhook.Replicas = pointer.Int32(1)
263+
webhook.Replicas = ptr.To[int32](1)
264264
}
265265
}
266266

@@ -280,7 +280,7 @@ func setDefaultsKarmadaSearch(obj *KarmadaComponents) {
280280
search.ImagePullPolicy = corev1.PullIfNotPresent
281281
}
282282
if search.Replicas == nil {
283-
search.Replicas = pointer.Int32(1)
283+
search.Replicas = ptr.To[int32](1)
284284
}
285285
}
286286

@@ -300,7 +300,7 @@ func setDefaultsKarmadaDescheduler(obj *KarmadaComponents) {
300300
descheduler.ImagePullPolicy = corev1.PullIfNotPresent
301301
}
302302
if descheduler.Replicas == nil {
303-
descheduler.Replicas = pointer.Int32(1)
303+
descheduler.Replicas = ptr.To[int32](1)
304304
}
305305
}
306306

@@ -320,6 +320,6 @@ func setDefaultsKarmadaMetricsAdapter(obj *KarmadaComponents) {
320320
metricsAdapter.ImagePullPolicy = corev1.PullIfNotPresent
321321
}
322322
if metricsAdapter.Replicas == nil {
323-
metricsAdapter.Replicas = pointer.Int32(2)
323+
metricsAdapter.Replicas = ptr.To[int32](2)
324324
}
325325
}

‎pkg/apis/policy/v1alpha1/propagation_helper_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1alpha1
1919
import (
2020
"testing"
2121

22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
)
2424

2525
func TestPropagationPolicy_ExplicitPriority(t *testing.T) {
@@ -34,7 +34,7 @@ func TestPropagationPolicy_ExplicitPriority(t *testing.T) {
3434
},
3535
{
3636
name: "expected to be declared priority in pp",
37-
declaredPriority: pointer.Int32(20),
37+
declaredPriority: ptr.To[int32](20),
3838
expectedPriority: 20,
3939
},
4040
}
@@ -62,7 +62,7 @@ func TestClusterPropagationPolicy_ExplicitPriority(t *testing.T) {
6262
},
6363
{
6464
name: "expected to be declared priority in cpp",
65-
declaredPriority: pointer.Int32(20),
65+
declaredPriority: ptr.To[int32](20),
6666
expectedPriority: 20,
6767
},
6868
}

‎pkg/apis/work/v1alpha2/binding_types_helper_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import (
2020
"reflect"
2121
"testing"
2222

23-
"k8s.io/utils/pointer"
23+
"k8s.io/utils/ptr"
2424
)
2525

2626
func TestResourceBindingSpec_TargetContains(t *testing.T) {
@@ -181,7 +181,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
181181
GracefulEvictionTasks: []GracefulEvictionTask{
182182
{
183183
FromCluster: "m1",
184-
Replicas: pointer.Int32(1),
184+
Replicas: ptr.To[int32](1),
185185
Reason: EvictionReasonTaintUntolerated,
186186
Message: "graceful eviction",
187187
Producer: EvictionProducerTaintManager,
@@ -205,7 +205,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
205205
GracefulEvictionTasks: []GracefulEvictionTask{
206206
{
207207
FromCluster: "m2",
208-
Replicas: pointer.Int32(2),
208+
Replicas: ptr.To[int32](2),
209209
Reason: EvictionReasonTaintUntolerated,
210210
Message: "graceful eviction",
211211
Producer: EvictionProducerTaintManager,
@@ -229,7 +229,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
229229
GracefulEvictionTasks: []GracefulEvictionTask{
230230
{
231231
FromCluster: "m3",
232-
Replicas: pointer.Int32(3),
232+
Replicas: ptr.To[int32](3),
233233
Reason: EvictionReasonTaintUntolerated,
234234
Message: "graceful eviction",
235235
Producer: EvictionProducerTaintManager,
@@ -257,7 +257,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
257257
},
258258
{
259259
FromCluster: "m3",
260-
Replicas: pointer.Int32(3),
260+
Replicas: ptr.To[int32](3),
261261
Reason: EvictionReasonTaintUntolerated,
262262
Message: "graceful eviction",
263263
Producer: EvictionProducerTaintManager,
@@ -277,7 +277,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
277277
GracefulEvictionTasks: []GracefulEvictionTask{
278278
{
279279
FromCluster: "m1",
280-
Replicas: pointer.Int32(1),
280+
Replicas: ptr.To[int32](1),
281281
Reason: EvictionReasonTaintUntolerated,
282282
Message: "graceful eviction v1",
283283
Producer: EvictionProducerTaintManager,
@@ -286,7 +286,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
286286
},
287287
EvictEvent: GracefulEvictionTask{
288288
FromCluster: "m1",
289-
Replicas: pointer.Int32(1),
289+
Replicas: ptr.To[int32](1),
290290
Reason: EvictionReasonTaintUntolerated,
291291
Message: "graceful eviction v2",
292292
Producer: EvictionProducerTaintManager,
@@ -296,7 +296,7 @@ func TestResourceBindingSpec_GracefulEvictCluster(t *testing.T) {
296296
GracefulEvictionTasks: []GracefulEvictionTask{
297297
{
298298
FromCluster: "m1",
299-
Replicas: pointer.Int32(1),
299+
Replicas: ptr.To[int32](1),
300300
Reason: EvictionReasonTaintUntolerated,
301301
Message: "graceful eviction v1",
302302
Producer: EvictionProducerTaintManager,

‎pkg/controllers/applicationfailover/crb_application_failover_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/util/sets"
2929
"k8s.io/client-go/tools/record"
3030
"k8s.io/klog/v2"
31-
"k8s.io/utils/pointer"
31+
"k8s.io/utils/ptr"
3232
controllerruntime "sigs.k8s.io/controller-runtime"
3333
"sigs.k8s.io/controller-runtime/pkg/builder"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -165,7 +165,7 @@ func (c *CRBApplicationFailoverController) evictBinding(binding *workv1alpha2.Cl
165165
}
166166
case policyv1alpha1.Never:
167167
if features.FeatureGate.Enabled(features.GracefulEviction) {
168-
binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(CRBApplicationFailoverControllerName), workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(pointer.Bool(true))))
168+
binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(CRBApplicationFailoverControllerName), workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(ptr.To[bool](true))))
169169
} else {
170170
err := fmt.Errorf("GracefulEviction featureGate must be enabled when purgeMode is %s", policyv1alpha1.Never)
171171
klog.Error(err)

‎pkg/controllers/applicationfailover/rb_application_failover_controller.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"k8s.io/apimachinery/pkg/util/sets"
2929
"k8s.io/client-go/tools/record"
3030
"k8s.io/klog/v2"
31-
"k8s.io/utils/pointer"
31+
"k8s.io/utils/ptr"
3232
controllerruntime "sigs.k8s.io/controller-runtime"
3333
"sigs.k8s.io/controller-runtime/pkg/builder"
3434
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -167,7 +167,7 @@ func (c *RBApplicationFailoverController) evictBinding(binding *workv1alpha2.Res
167167
case policyv1alpha1.Never:
168168
if features.FeatureGate.Enabled(features.GracefulEviction) {
169169
binding.Spec.GracefulEvictCluster(cluster, workv1alpha2.NewTaskOptions(workv1alpha2.WithProducer(RBApplicationFailoverControllerName),
170-
workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(pointer.Bool(true))))
170+
workv1alpha2.WithReason(workv1alpha2.EvictionReasonApplicationFailure), workv1alpha2.WithSuppressDeletion(ptr.To[bool](true))))
171171
} else {
172172
err := fmt.Errorf("GracefulEviction featureGate must be enabled when purgeMode is %s", policyv1alpha1.Never)
173173
klog.Error(err)

‎pkg/controllers/gracefuleviction/evictiontask_test.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"time"
2323

2424
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25-
"k8s.io/utils/pointer"
25+
"k8s.io/utils/ptr"
2626

2727
workv1alpha2 "github.com/karmada-io/karmada/pkg/apis/work/v1alpha2"
2828
)
@@ -143,7 +143,7 @@ func Test_assessSingleTask(t *testing.T) {
143143
args: args{
144144
task: workv1alpha2.GracefulEvictionTask{
145145
FromCluster: "member1",
146-
GracePeriodSeconds: pointer.Int32(30),
146+
GracePeriodSeconds: ptr.To[int32](30),
147147
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
148148
},
149149
opt: assessmentOption{
@@ -163,7 +163,7 @@ func Test_assessSingleTask(t *testing.T) {
163163
args: args{
164164
task: workv1alpha2.GracefulEvictionTask{
165165
FromCluster: "member1",
166-
GracePeriodSeconds: pointer.Int32(120),
166+
GracePeriodSeconds: ptr.To[int32](120),
167167
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
168168
},
169169
opt: assessmentOption{
@@ -178,7 +178,7 @@ func Test_assessSingleTask(t *testing.T) {
178178
},
179179
want: &workv1alpha2.GracefulEvictionTask{
180180
FromCluster: "member1",
181-
GracePeriodSeconds: pointer.Int32(120),
181+
GracePeriodSeconds: ptr.To[int32](120),
182182
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
183183
},
184184
},
@@ -187,7 +187,7 @@ func Test_assessSingleTask(t *testing.T) {
187187
args: args{
188188
task: workv1alpha2.GracefulEvictionTask{
189189
FromCluster: "member1",
190-
SuppressDeletion: pointer.Bool(true),
190+
SuppressDeletion: ptr.To[bool](true),
191191
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
192192
},
193193
opt: assessmentOption{
@@ -202,7 +202,7 @@ func Test_assessSingleTask(t *testing.T) {
202202
},
203203
want: &workv1alpha2.GracefulEvictionTask{
204204
FromCluster: "member1",
205-
SuppressDeletion: pointer.Bool(true),
205+
SuppressDeletion: ptr.To[bool](true),
206206
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
207207
},
208208
},
@@ -211,7 +211,7 @@ func Test_assessSingleTask(t *testing.T) {
211211
args: args{
212212
task: workv1alpha2.GracefulEvictionTask{
213213
FromCluster: "member1",
214-
SuppressDeletion: pointer.Bool(false),
214+
SuppressDeletion: ptr.To[bool](false),
215215
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -1)},
216216
},
217217
opt: assessmentOption{
@@ -594,7 +594,7 @@ func Test_nextRetry(t *testing.T) {
594594
{
595595
FromCluster: "member1",
596596
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -60)},
597-
SuppressDeletion: pointer.Bool(true),
597+
SuppressDeletion: ptr.To[bool](true),
598598
},
599599
{
600600
FromCluster: "member2",
@@ -613,12 +613,12 @@ func Test_nextRetry(t *testing.T) {
613613
{
614614
FromCluster: "member1",
615615
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -60)},
616-
SuppressDeletion: pointer.Bool(true),
616+
SuppressDeletion: ptr.To[bool](true),
617617
},
618618
{
619619
FromCluster: "member2",
620620
CreationTimestamp: &metav1.Time{Time: timeNow.Add(time.Minute * -5)},
621-
SuppressDeletion: pointer.Bool(true),
621+
SuppressDeletion: ptr.To[bool](true),
622622
},
623623
},
624624
timeout: timeout,

‎pkg/controllers/workloadrebalancer/workloadrebalancer_controller_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
apierrors "k8s.io/apimachinery/pkg/api/errors"
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
"k8s.io/apimachinery/pkg/types"
29-
"k8s.io/utils/pointer"
29+
"k8s.io/utils/ptr"
3030
controllerruntime "sigs.k8s.io/controller-runtime"
3131
"sigs.k8s.io/controller-runtime/pkg/client"
3232
"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -126,7 +126,7 @@ var (
126126
ttlFinishedRebalancer = &appsv1alpha1.WorkloadRebalancer{
127127
ObjectMeta: metav1.ObjectMeta{Name: "ttl-finished-rebalancer", CreationTimestamp: oneHourAgo},
128128
Spec: appsv1alpha1.WorkloadRebalancerSpec{
129-
TTLSecondsAfterFinished: pointer.Int32(5),
129+
TTLSecondsAfterFinished: ptr.To[int32](5),
130130
Workloads: []appsv1alpha1.ObjectReference{deploy1Obj},
131131
},
132132
Status: appsv1alpha1.WorkloadRebalancerStatus{

0 commit comments

Comments
 (0)