Skip to content

Commit 639ca12

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #2014 from shiftstack/pointer-to-ptr
🌱 Bump k8s dep to 0.29.3
2 parents 7e34a22 + d04c4d5 commit 639ca12

40 files changed

+433
-439
lines changed

‎api/v1alpha5/conversion.go

+10-10
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
conversion "k8s.io/apimachinery/pkg/conversion"
24-
"k8s.io/utils/pointer"
24+
"k8s.io/utils/ptr"
2525
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
2626
ctrlconversion "sigs.k8s.io/controller-runtime/pkg/conversion"
2727

@@ -301,7 +301,7 @@ func Convert_v1alpha5_OpenStackClusterSpec_To_v1beta1_OpenStackClusterSpec(in *O
301301
}
302302

303303
if in.APIServerPort != 0 {
304-
out.APIServerPort = pointer.Int(in.APIServerPort)
304+
out.APIServerPort = ptr.To(in.APIServerPort)
305305
}
306306

307307
return nil
@@ -333,10 +333,10 @@ func Convert_v1beta1_PortOpts_To_v1alpha5_PortOpts(in *infrav1.PortOpts, out *Po
333333

334334
if in.Profile != nil {
335335
out.Profile = make(map[string]string)
336-
if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
336+
if ptr.Deref(in.Profile.OVSHWOffload, false) {
337337
(out.Profile)["capabilities"] = "[\"switchdev\"]"
338338
}
339-
if pointer.BoolDeref(in.Profile.TrustedVF, false) {
339+
if ptr.Deref(in.Profile.TrustedVF, false) {
340340
(out.Profile)["trusted"] = trueString
341341
}
342342
}
@@ -435,10 +435,10 @@ func Convert_v1alpha5_PortOpts_To_v1beta1_PortOpts(in *PortOpts, out *infrav1.Po
435435

436436
// Profile is now a struct in v1beta1.
437437
if strings.Contains(in.Profile["capabilities"], "switchdev") {
438-
out.Profile.OVSHWOffload = pointer.Bool(true)
438+
out.Profile.OVSHWOffload = ptr.To(true)
439439
}
440440
if in.Profile["trusted"] == trueString {
441-
out.Profile.TrustedVF = pointer.Bool(true)
441+
out.Profile.TrustedVF = ptr.To(true)
442442
}
443443
return nil
444444
}
@@ -608,21 +608,21 @@ func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]str
608608
for k, v := range in {
609609
if k == "capabilities" {
610610
if strings.Contains(v, "switchdev") {
611-
out.OVSHWOffload = pointer.Bool(true)
611+
out.OVSHWOffload = ptr.To(true)
612612
}
613613
}
614614
if k == "trusted" && v == trueString {
615-
out.TrustedVF = pointer.Bool(true)
615+
out.TrustedVF = ptr.To(true)
616616
}
617617
}
618618
return nil
619619
}
620620

621621
func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ conversion.Scope) error {
622-
if pointer.BoolDeref(in.OVSHWOffload, false) {
622+
if ptr.Deref(in.OVSHWOffload, false) {
623623
(out)["capabilities"] = "[\"switchdev\"]"
624624
}
625-
if pointer.BoolDeref(in.TrustedVF, false) {
625+
if ptr.Deref(in.TrustedVF, false) {
626626
(out)["trusted"] = trueString
627627
}
628628
return nil

‎api/v1alpha6/conversion_test.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
runtime "k8s.io/apimachinery/pkg/runtime"
2929
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
30-
"k8s.io/utils/pointer"
30+
"k8s.io/utils/ptr"
3131
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
3232
"sigs.k8s.io/controller-runtime/pkg/conversion"
3333

@@ -221,7 +221,7 @@ func TestNetworksToPorts(t *testing.T) {
221221
Ports: []infrav1.PortOpts{
222222
{
223223
Network: &infrav1.NetworkParam{
224-
ID: pointer.String(networkuuid),
224+
ID: ptr.To(networkuuid),
225225
},
226226
},
227227
},
@@ -282,12 +282,12 @@ func TestNetworksToPorts(t *testing.T) {
282282
Ports: []infrav1.PortOpts{
283283
{
284284
Network: &infrav1.NetworkParam{
285-
ID: pointer.String(networkuuid),
285+
ID: ptr.To(networkuuid),
286286
},
287287
FixedIPs: []infrav1.FixedIP{
288288
{
289289
Subnet: &infrav1.SubnetParam{
290-
ID: pointer.String(subnetuuid),
290+
ID: ptr.To(subnetuuid),
291291
},
292292
},
293293
},
@@ -326,7 +326,7 @@ func TestNetworksToPorts(t *testing.T) {
326326
Ports: []infrav1.PortOpts{
327327
{
328328
Network: &infrav1.NetworkParam{
329-
ID: pointer.String(networkuuid),
329+
ID: ptr.To(networkuuid),
330330
},
331331
FixedIPs: []infrav1.FixedIP{
332332
{
@@ -388,19 +388,19 @@ func TestNetworksToPorts(t *testing.T) {
388388
Ports: []infrav1.PortOpts{
389389
{
390390
Network: &infrav1.NetworkParam{
391-
ID: pointer.String(networkuuid),
391+
ID: ptr.To(networkuuid),
392392
},
393393
FixedIPs: []infrav1.FixedIP{
394394
{
395395
Subnet: &infrav1.SubnetParam{
396-
ID: pointer.String(subnetuuid),
396+
ID: ptr.To(subnetuuid),
397397
},
398398
},
399399
},
400400
},
401401
{
402402
Network: &infrav1.NetworkParam{
403-
ID: pointer.String(networkuuid),
403+
ID: ptr.To(networkuuid),
404404
},
405405
FixedIPs: []infrav1.FixedIP{
406406
{
@@ -465,7 +465,7 @@ func TestPortOptsConvertTo(t *testing.T) {
465465
}
466466
securityGroupFilterMerged := []infrav1.SecurityGroupParam{
467467
{Filter: &infrav1.SecurityGroupFilter{Name: "one"}},
468-
{ID: pointer.String("654cba")},
468+
{ID: ptr.To("654cba")},
469469
{ID: &uuids[0]},
470470
{ID: &uuids[1]},
471471
}
@@ -474,8 +474,8 @@ func TestPortOptsConvertTo(t *testing.T) {
474474
"trusted": "true",
475475
}
476476
convertedPortProfile := infrav1.BindingProfile{
477-
OVSHWOffload: pointer.Bool(true),
478-
TrustedVF: pointer.Bool(true),
477+
OVSHWOffload: ptr.To(true),
478+
TrustedVF: ptr.To(true),
479479
}
480480

481481
tests := []struct {
@@ -597,31 +597,31 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
597597
{
598598
name: "Set ProviderID",
599599
modifyUp: func(up *infrav1.OpenStackMachine) {
600-
up.Spec.ProviderID = pointer.String("new-provider-id")
600+
up.Spec.ProviderID = ptr.To("new-provider-id")
601601
},
602602
testAfter: func(after *OpenStackMachine) {
603-
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
603+
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
604604
},
605605
expectNetworkDiff: false,
606606
},
607607
{
608608
name: "Set InstanceID",
609609
modifyUp: func(up *infrav1.OpenStackMachine) {
610-
up.Status.InstanceID = pointer.String("new-instance-id")
610+
up.Status.InstanceID = ptr.To("new-instance-id")
611611
},
612612
testAfter: func(after *OpenStackMachine) {
613-
g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))
613+
g.Expect(after.Spec.InstanceID).To(gomega.Equal(ptr.To("new-instance-id")))
614614
},
615615
expectNetworkDiff: false,
616616
},
617617
{
618618
name: "Set ProviderID and non-ignored change",
619619
modifyUp: func(up *infrav1.OpenStackMachine) {
620-
up.Spec.ProviderID = pointer.String("new-provider-id")
620+
up.Spec.ProviderID = ptr.To("new-provider-id")
621621
up.Spec.Flavor = "new-flavor"
622622
},
623623
testAfter: func(after *OpenStackMachine) {
624-
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
624+
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
625625
g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
626626
},
627627
expectNetworkDiff: true,

‎api/v1alpha6/openstackmachine_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1alpha6
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2424
"sigs.k8s.io/cluster-api/errors"
2525
)
@@ -184,7 +184,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
184184
// SetFailure sets the OpenStackMachine status failure reason and failure message.
185185
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
186186
r.Status.FailureReason = &failureReason
187-
r.Status.FailureMessage = pointer.String(failureMessage.Error())
187+
r.Status.FailureMessage = ptr.To(failureMessage.Error())
188188
}
189189

190190
func init() {

‎api/v1alpha6/types_conversion.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
"strings"
2222

2323
apiconversion "k8s.io/apimachinery/pkg/conversion"
24-
"k8s.io/utils/pointer"
24+
"k8s.io/utils/ptr"
2525

2626
infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1beta1"
2727
optional "sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
@@ -387,10 +387,10 @@ func Convert_v1beta1_PortOpts_To_v1alpha6_PortOpts(in *infrav1.PortOpts, out *Po
387387

388388
if in.Profile != nil {
389389
out.Profile = make(map[string]string)
390-
if pointer.BoolDeref(in.Profile.OVSHWOffload, false) {
390+
if ptr.Deref(in.Profile.OVSHWOffload, false) {
391391
(out.Profile)["capabilities"] = "[\"switchdev\"]"
392392
}
393-
if pointer.BoolDeref(in.Profile.TrustedVF, false) {
393+
if ptr.Deref(in.Profile.TrustedVF, false) {
394394
(out.Profile)["trusted"] = trueString
395395
}
396396
}
@@ -402,21 +402,21 @@ func Convert_Map_string_To_Interface_To_v1beta1_BindingProfile(in map[string]str
402402
for k, v := range in {
403403
if k == "capabilities" {
404404
if strings.Contains(v, "switchdev") {
405-
out.OVSHWOffload = pointer.Bool(true)
405+
out.OVSHWOffload = ptr.To(true)
406406
}
407407
}
408408
if k == "trusted" && v == trueString {
409-
out.TrustedVF = pointer.Bool(true)
409+
out.TrustedVF = ptr.To(true)
410410
}
411411
}
412412
return nil
413413
}
414414

415415
func Convert_v1beta1_BindingProfile_To_Map_string_To_Interface(in *infrav1.BindingProfile, out map[string]string, _ apiconversion.Scope) error {
416-
if pointer.BoolDeref(in.OVSHWOffload, false) {
416+
if ptr.Deref(in.OVSHWOffload, false) {
417417
(out)["capabilities"] = "[\"switchdev\"]"
418418
}
419-
if pointer.BoolDeref(in.TrustedVF, false) {
419+
if ptr.Deref(in.TrustedVF, false) {
420420
(out)["trusted"] = trueString
421421
}
422422
return nil

‎api/v1alpha7/conversion_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2828
runtime "k8s.io/apimachinery/pkg/runtime"
2929
runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
30-
"k8s.io/utils/pointer"
30+
"k8s.io/utils/ptr"
3131
utilconversion "sigs.k8s.io/cluster-api/util/conversion"
3232
"sigs.k8s.io/controller-runtime/pkg/conversion"
3333

@@ -201,31 +201,31 @@ func TestMachineConversionControllerSpecFields(t *testing.T) {
201201
{
202202
name: "Set ProviderID",
203203
modifyUp: func(up *infrav1.OpenStackMachine) {
204-
up.Spec.ProviderID = pointer.String("new-provider-id")
204+
up.Spec.ProviderID = ptr.To("new-provider-id")
205205
},
206206
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
207-
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
207+
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
208208
},
209209
expectIdentityRefDiff: false,
210210
},
211211
{
212212
name: "Set InstanceID",
213213
modifyUp: func(up *infrav1.OpenStackMachine) {
214-
up.Status.InstanceID = pointer.String("new-instance-id")
214+
up.Status.InstanceID = ptr.To("new-instance-id")
215215
},
216216
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
217-
g.Expect(after.Spec.InstanceID).To(gomega.Equal(pointer.String("new-instance-id")))
217+
g.Expect(after.Spec.InstanceID).To(gomega.Equal(ptr.To("new-instance-id")))
218218
},
219219
expectIdentityRefDiff: false,
220220
},
221221
{
222222
name: "Set ProviderID and non-ignored change",
223223
modifyUp: func(up *infrav1.OpenStackMachine) {
224-
up.Spec.ProviderID = pointer.String("new-provider-id")
224+
up.Spec.ProviderID = ptr.To("new-provider-id")
225225
up.Spec.Flavor = "new-flavor"
226226
},
227227
testAfter: func(g gomega.Gomega, after *OpenStackMachine) {
228-
g.Expect(after.Spec.ProviderID).To(gomega.Equal(pointer.String("new-provider-id")))
228+
g.Expect(after.Spec.ProviderID).To(gomega.Equal(ptr.To("new-provider-id")))
229229
g.Expect(after.Spec.Flavor).To(gomega.Equal("new-flavor"))
230230
},
231231
expectIdentityRefDiff: true,

‎api/v1alpha7/openstackmachine_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1alpha7
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2424
"sigs.k8s.io/cluster-api/errors"
2525
)
@@ -179,7 +179,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
179179
// SetFailure sets the OpenStackMachine status failure reason and failure message.
180180
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
181181
r.Status.FailureReason = &failureReason
182-
r.Status.FailureMessage = pointer.String(failureMessage.Error())
182+
r.Status.FailureMessage = ptr.To(failureMessage.Error())
183183
}
184184

185185
func init() {

‎api/v1beta1/conversion.go

+9-9
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
"strings"
2121

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

2525
// Hub marks OpenStackCluster as a conversion hub.
@@ -53,20 +53,20 @@ func LegacyCalicoSecurityGroupRules() []SecurityGroupRuleSpec {
5353
return []SecurityGroupRuleSpec{
5454
{
5555
Name: "BGP (calico)",
56-
Description: pointer.String("Created by cluster-api-provider-openstack API conversion - BGP (calico)"),
56+
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - BGP (calico)"),
5757
Direction: "ingress",
58-
EtherType: pointer.String("IPv4"),
59-
PortRangeMin: pointer.Int(179),
60-
PortRangeMax: pointer.Int(179),
61-
Protocol: pointer.String("tcp"),
58+
EtherType: ptr.To("IPv4"),
59+
PortRangeMin: ptr.To(179),
60+
PortRangeMax: ptr.To(179),
61+
Protocol: ptr.To("tcp"),
6262
RemoteManagedGroups: []ManagedSecurityGroupName{"controlplane", "worker"},
6363
},
6464
{
6565
Name: "IP-in-IP (calico)",
66-
Description: pointer.String("Created by cluster-api-provider-openstack API conversion - IP-in-IP (calico)"),
66+
Description: ptr.To("Created by cluster-api-provider-openstack API conversion - IP-in-IP (calico)"),
6767
Direction: "ingress",
68-
EtherType: pointer.String("IPv4"),
69-
Protocol: pointer.String("4"),
68+
EtherType: ptr.To("IPv4"),
69+
Protocol: ptr.To("4"),
7070
RemoteManagedGroups: []ManagedSecurityGroupName{"controlplane", "worker"},
7171
},
7272
}

‎api/v1beta1/openstackmachine_types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package v1beta1
1919
import (
2020
corev1 "k8s.io/api/core/v1"
2121
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
22-
"k8s.io/utils/pointer"
22+
"k8s.io/utils/ptr"
2323
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
2424
"sigs.k8s.io/cluster-api/errors"
2525

@@ -206,7 +206,7 @@ func (r *OpenStackMachine) SetConditions(conditions clusterv1.Conditions) {
206206
// SetFailure sets the OpenStackMachine status failure reason and failure message.
207207
func (r *OpenStackMachine) SetFailure(failureReason errors.MachineStatusError, failureMessage error) {
208208
r.Status.FailureReason = &failureReason
209-
r.Status.FailureMessage = pointer.String(failureMessage.Error())
209+
r.Status.FailureMessage = ptr.To(failureMessage.Error())
210210
}
211211

212212
func init() {

‎api/v1beta1/types.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package v1beta1
1818

1919
import (
20-
"k8s.io/utils/pointer"
20+
"k8s.io/utils/ptr"
2121

2222
"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/optional"
2323
)
@@ -827,7 +827,7 @@ type APIServerLoadBalancer struct {
827827
}
828828

829829
func (s *APIServerLoadBalancer) IsZero() bool {
830-
return s == nil || ((s.Enabled == nil || !*s.Enabled) && len(s.AdditionalPorts) == 0 && len(s.AllowedCIDRs) == 0 && pointer.StringDeref(s.Provider, "") == "")
830+
return s == nil || ((s.Enabled == nil || !*s.Enabled) && len(s.AdditionalPorts) == 0 && len(s.AllowedCIDRs) == 0 && ptr.Deref(s.Provider, "") == "")
831831
}
832832

833833
func (s *APIServerLoadBalancer) IsEnabled() bool {

0 commit comments

Comments
 (0)