Skip to content

Commit bb6df67

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #7396 from killianmuldoon/update/deprecated-pointer-methods
🌱 Replace deprecated functions from k8s.io/utils/pointer
2 parents 84b1728 + dba69ff commit bb6df67

File tree

73 files changed

+368
-371
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+368
-371
lines changed

‎api/v1alpha3/cluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ func (in FailureDomains) FilterControlPlane() FailureDomains {
255255
func (in FailureDomains) GetIDs() []*string {
256256
ids := make([]*string, 0, len(in))
257257
for id := range in {
258-
ids = append(ids, pointer.StringPtr(id))
258+
ids = append(ids, pointer.String(id))
259259
}
260260
return ids
261261
}

‎api/v1alpha3/webhook_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ func TestMachineSetConversion(t *testing.T) {
6363
ClusterName: clusterName,
6464
Template: newFakeMachineTemplate(ns.Name, clusterName),
6565
MinReadySeconds: 10,
66-
Replicas: pointer.Int32Ptr(1),
66+
Replicas: pointer.Int32(1),
6767
DeletePolicy: "Random",
6868
},
6969
}
@@ -89,7 +89,7 @@ func TestMachineDeploymentConversion(t *testing.T) {
8989
Spec: MachineDeploymentSpec{
9090
ClusterName: clusterName,
9191
Template: newFakeMachineTemplate(ns.Name, clusterName),
92-
Replicas: pointer.Int32Ptr(0),
92+
Replicas: pointer.Int32(0),
9393
},
9494
}
9595

‎api/v1alpha4/cluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -416,7 +416,7 @@ func (in FailureDomains) FilterControlPlane() FailureDomains {
416416
func (in FailureDomains) GetIDs() []*string {
417417
ids := make([]*string, 0, len(in))
418418
for id := range in {
419-
ids = append(ids, pointer.StringPtr(id))
419+
ids = append(ids, pointer.String(id))
420420
}
421421
return ids
422422
}

‎api/v1beta1/cluster_types.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -525,7 +525,7 @@ func (in FailureDomains) FilterControlPlane() FailureDomains {
525525
func (in FailureDomains) GetIDs() []*string {
526526
ids := make([]*string, 0, len(in))
527527
for id := range in {
528-
ids = append(ids, pointer.StringPtr(id))
528+
ids = append(ids, pointer.String(id))
529529
}
530530
return ids
531531
}

‎api/v1beta1/machine_webhook_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestMachineDefault(t *testing.T) {
3636
},
3737
Spec: MachineSpec{
3838
Bootstrap: Bootstrap{ConfigRef: &corev1.ObjectReference{}},
39-
Version: pointer.StringPtr("1.17.5"),
39+
Version: pointer.String("1.17.5"),
4040
},
4141
}
4242
t.Run("for Machine", utildefaulting.DefaultValidateTest(m))
@@ -62,7 +62,7 @@ func TestMachineBootstrapValidation(t *testing.T) {
6262
},
6363
{
6464
name: "should not return error if dataSecretName is set",
65-
bootstrap: Bootstrap{ConfigRef: nil, DataSecretName: pointer.StringPtr("test")},
65+
bootstrap: Bootstrap{ConfigRef: nil, DataSecretName: pointer.String("test")},
6666
expectErr: false,
6767
},
6868
{
@@ -234,7 +234,7 @@ func TestMachineVersionValidation(t *testing.T) {
234234
m := &Machine{
235235
Spec: MachineSpec{
236236
Version: &tt.version,
237-
Bootstrap: Bootstrap{ConfigRef: nil, DataSecretName: pointer.StringPtr("test")},
237+
Bootstrap: Bootstrap{ConfigRef: nil, DataSecretName: pointer.String("test")},
238238
},
239239
}
240240

‎api/v1beta1/machinedeployment_webhook.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,15 +152,15 @@ func PopulateDefaultsMachineDeployment(d *MachineDeployment) {
152152
d.Labels[ClusterLabelName] = d.Spec.ClusterName
153153

154154
if d.Spec.MinReadySeconds == nil {
155-
d.Spec.MinReadySeconds = pointer.Int32Ptr(0)
155+
d.Spec.MinReadySeconds = pointer.Int32(0)
156156
}
157157

158158
if d.Spec.RevisionHistoryLimit == nil {
159-
d.Spec.RevisionHistoryLimit = pointer.Int32Ptr(1)
159+
d.Spec.RevisionHistoryLimit = pointer.Int32(1)
160160
}
161161

162162
if d.Spec.ProgressDeadlineSeconds == nil {
163-
d.Spec.ProgressDeadlineSeconds = pointer.Int32Ptr(600)
163+
d.Spec.ProgressDeadlineSeconds = pointer.Int32(600)
164164
}
165165

166166
if d.Spec.Selector.MatchLabels == nil {

‎api/v1beta1/machinedeployment_webhook_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ func TestMachineDeploymentDefault(t *testing.T) {
4545
md.Default()
4646

4747
g.Expect(md.Labels[ClusterLabelName]).To(Equal(md.Spec.ClusterName))
48-
g.Expect(md.Spec.MinReadySeconds).To(Equal(pointer.Int32Ptr(0)))
49-
g.Expect(md.Spec.RevisionHistoryLimit).To(Equal(pointer.Int32Ptr(1)))
50-
g.Expect(md.Spec.ProgressDeadlineSeconds).To(Equal(pointer.Int32Ptr(600)))
48+
g.Expect(md.Spec.MinReadySeconds).To(Equal(pointer.Int32(0)))
49+
g.Expect(md.Spec.RevisionHistoryLimit).To(Equal(pointer.Int32(1)))
50+
g.Expect(md.Spec.ProgressDeadlineSeconds).To(Equal(pointer.Int32(600)))
5151
g.Expect(md.Spec.Strategy).ToNot(BeNil())
5252
g.Expect(md.Spec.Selector.MatchLabels).To(HaveKeyWithValue(MachineDeploymentLabelName, "test-md"))
5353
g.Expect(md.Spec.Template.Labels).To(HaveKeyWithValue(MachineDeploymentLabelName, "test-md"))

‎bootstrap/kubeadm/api/v1beta1/kubeadmconfig_webhook_test.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ func TestKubeadmConfigDefault(t *testing.T) {
4040
Spec: KubeadmConfigSpec{},
4141
}
4242
updateDefaultingKubeadmConfig := kubeadmConfig.DeepCopy()
43-
updateDefaultingKubeadmConfig.Spec.Verbosity = pointer.Int32Ptr(4)
43+
updateDefaultingKubeadmConfig.Spec.Verbosity = pointer.Int32(4)
4444
t.Run("for KubeadmConfig", utildefaulting.DefaultValidateTest(updateDefaultingKubeadmConfig))
4545

4646
kubeadmConfig.Default()
@@ -187,7 +187,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
187187
Spec: KubeadmConfigSpec{
188188
Users: []User{
189189
{
190-
Passwd: pointer.StringPtr("foo"),
190+
Passwd: pointer.String("foo"),
191191
},
192192
},
193193
},
@@ -223,7 +223,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
223223
Users: []User{
224224
{
225225
PasswdFrom: &PasswdSource{},
226-
Passwd: pointer.StringPtr("foo"),
226+
Passwd: pointer.String("foo"),
227227
},
228228
},
229229
},
@@ -244,7 +244,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
244244
Key: "bar",
245245
},
246246
},
247-
Passwd: pointer.StringPtr("foo"),
247+
Passwd: pointer.String("foo"),
248248
},
249249
},
250250
},
@@ -265,7 +265,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
265265
Name: "foo",
266266
},
267267
},
268-
Passwd: pointer.StringPtr("foo"),
268+
Passwd: pointer.String("foo"),
269269
},
270270
},
271271
},
@@ -308,7 +308,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
308308
Format: Ignition,
309309
Users: []User{
310310
{
311-
Inactive: pointer.BoolPtr(true),
311+
Inactive: pointer.Bool(true),
312312
},
313313
},
314314
},
@@ -327,7 +327,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
327327
DiskSetup: &DiskSetup{
328328
Partitions: []Partition{
329329
{
330-
TableType: pointer.StringPtr("MS-DOS"),
330+
TableType: pointer.String("MS-DOS"),
331331
},
332332
},
333333
},
@@ -388,7 +388,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
388388
DiskSetup: &DiskSetup{
389389
Filesystems: []Filesystem{
390390
{
391-
ReplaceFS: pointer.StringPtr("ntfs"),
391+
ReplaceFS: pointer.String("ntfs"),
392392
},
393393
},
394394
},
@@ -408,7 +408,7 @@ func TestKubeadmConfigValidate(t *testing.T) {
408408
DiskSetup: &DiskSetup{
409409
Filesystems: []Filesystem{
410410
{
411-
Partition: pointer.StringPtr("1"),
411+
Partition: pointer.String("1"),
412412
},
413413
},
414414
},

‎bootstrap/kubeadm/api/v1beta1/kubeadmconfigtemplate_webhook_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func TestKubeadmConfigTemplateDefault(t *testing.T) {
3636
},
3737
}
3838
updateDefaultingKubeadmConfigTemplate := kubeadmConfigTemplate.DeepCopy()
39-
updateDefaultingKubeadmConfigTemplate.Spec.Template.Spec.Verbosity = pointer.Int32Ptr(4)
39+
updateDefaultingKubeadmConfigTemplate.Spec.Template.Spec.Verbosity = pointer.Int32(4)
4040
t.Run("for KubeadmConfigTemplate", utildefaulting.DefaultValidateTest(updateDefaultingKubeadmConfigTemplate))
4141

4242
kubeadmConfigTemplate.Default()

‎bootstrap/kubeadm/internal/cloudinit/cloudinit_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,8 +141,8 @@ func TestNewInitControlPlaneDiskMounts(t *testing.T) {
141141
{
142142
Device: "test-device",
143143
Layout: true,
144-
Overwrite: pointer.BoolPtr(false),
145-
TableType: pointer.StringPtr("gpt"),
144+
Overwrite: pointer.Bool(false),
145+
TableType: pointer.String("gpt"),
146146
},
147147
},
148148
Filesystems: []bootstrapv1.Filesystem{

0 commit comments

Comments
 (0)