Skip to content

Commit 608297d

Browse files
mboersmamboersma
committed
Use k8s utils/pointer instead of Azure autorest/to
1 parent f225d0f commit 608297d

File tree

133 files changed

+2004
-1970
lines changed

Some content is hidden

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

133 files changed

+2004
-1970
lines changed

‎api/v1alpha3/azurecluster_conversion.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error {
4646
// set default control plane outbound lb for private v1alpha3 clusters.
4747
if src.Spec.NetworkSpec.APIServerLB.Type == Internal {
4848
dst.Spec.NetworkSpec.ControlPlaneOutboundLB = &infrav1.LoadBalancerSpec{
49-
FrontendIPsCount: pointer.Int32Ptr(1),
49+
FrontendIPsCount: pointer.Int32(1),
5050
}
5151
// We also need to set the defaults here because "get" won't set defaults, and hence there is no mismatch when a client
5252
// gets a v1alpha3 cluster.
@@ -55,7 +55,7 @@ func (src *AzureCluster) ConvertTo(dstRaw conversion.Hub) error {
5555

5656
// set default node plane outbound lb for all v1alpha3 clusters.
5757
dst.Spec.NetworkSpec.NodeOutboundLB = &infrav1.LoadBalancerSpec{
58-
FrontendIPsCount: pointer.Int32Ptr(1),
58+
FrontendIPsCount: pointer.Int32(1),
5959
}
6060
// We also need to set the defaults here because "get" won't set defaults, and hence there is no mismatch when a client
6161
// gets a v1alpha3 cluster.

‎api/v1alpha3/conversion_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,10 +103,10 @@ func overrideOutboundLBFunc(codecs runtimeserializer.CodecFactory) []interface{}
103103
return []interface{}{
104104
func(networkSpec *infrav1.NetworkSpec, c fuzz.Continue) {
105105
networkSpec.ControlPlaneOutboundLB = &infrav1.LoadBalancerSpec{
106-
FrontendIPsCount: pointer.Int32Ptr(1),
106+
FrontendIPsCount: pointer.Int32(1),
107107
}
108108
networkSpec.NodeOutboundLB = &infrav1.LoadBalancerSpec{
109-
FrontendIPsCount: pointer.Int32Ptr(1),
109+
FrontendIPsCount: pointer.Int32(1),
110110
}
111111
},
112112
}

‎api/v1beta1/azurecluster_default.go‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ func (c *AzureCluster) SetNodeOutboundLBDefaults() {
232232
}
233233

234234
if lb.FrontendIPsCount == nil {
235-
lb.FrontendIPsCount = pointer.Int32Ptr(1)
235+
lb.FrontendIPsCount = pointer.Int32(1)
236236
}
237237

238238
c.setOutboundLBFrontendIPs(lb, generateNodeOutboundIPName)
@@ -255,7 +255,7 @@ func (c *AzureCluster) SetControlPlaneOutboundLBDefaults() {
255255
lb.Name = generateControlPlaneOutboundLBName(c.ObjectMeta.Name)
256256
}
257257
if lb.FrontendIPsCount == nil {
258-
lb.FrontendIPsCount = pointer.Int32Ptr(1)
258+
lb.FrontendIPsCount = pointer.Int32(1)
259259
}
260260
c.setOutboundLBFrontendIPs(lb, generateControlPlaneOutboundIPName)
261261

@@ -322,7 +322,7 @@ func (lb *LoadBalancerClassSpec) setAPIServerLBDefaults() {
322322
lb.SKU = SKUStandard
323323
}
324324
if lb.IdleTimeoutInMinutes == nil {
325-
lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
325+
lb.IdleTimeoutInMinutes = pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes)
326326
}
327327
}
328328

@@ -338,7 +338,7 @@ func (lb *LoadBalancerClassSpec) setOutboundLBDefaults() {
338338
lb.Type = Public
339339
lb.SKU = SKUStandard
340340
if lb.IdleTimeoutInMinutes == nil {
341-
lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
341+
lb.IdleTimeoutInMinutes = pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes)
342342
}
343343
}
344344

@@ -357,7 +357,7 @@ func setControlPlaneOutboundLBDefaults(lb *LoadBalancerClassSpec, apiserverLBTyp
357357
lb.SKU = SKUStandard
358358

359359
if lb.IdleTimeoutInMinutes == nil {
360-
lb.IdleTimeoutInMinutes = pointer.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes)
360+
lb.IdleTimeoutInMinutes = pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes)
361361
}
362362
}
363363

‎api/v1beta1/azurecluster_default_test.go‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
"github.com/Azure/go-autorest/autorest/to"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
"k8s.io/utils/pointer"
2626
)
2727

2828
func TestResourceGroupDefault(t *testing.T) {
@@ -139,7 +139,7 @@ func TestVnetDefaults(t *testing.T) {
139139
},
140140
},
141141
NodeOutboundLB: &LoadBalancerSpec{
142-
FrontendIPsCount: to.Int32Ptr(1),
142+
FrontendIPsCount: pointer.Int32(1),
143143
},
144144
},
145145
},
@@ -629,10 +629,10 @@ func TestSubnetDefaults(t *testing.T) {
629629
Description: "allow port 50000",
630630
Protocol: "*",
631631
Priority: 2202,
632-
SourcePorts: to.StringPtr("*"),
633-
DestinationPorts: to.StringPtr("*"),
634-
Source: to.StringPtr("*"),
635-
Destination: to.StringPtr("*"),
632+
SourcePorts: pointer.String("*"),
633+
DestinationPorts: pointer.String("*"),
634+
Source: pointer.String("*"),
635+
Destination: pointer.String("*"),
636636
},
637637
},
638638
},
@@ -664,10 +664,10 @@ func TestSubnetDefaults(t *testing.T) {
664664
Description: "allow port 50000",
665665
Protocol: "*",
666666
Priority: 2202,
667-
SourcePorts: to.StringPtr("*"),
668-
DestinationPorts: to.StringPtr("*"),
669-
Source: to.StringPtr("*"),
670-
Destination: to.StringPtr("*"),
667+
SourcePorts: pointer.String("*"),
668+
DestinationPorts: pointer.String("*"),
669+
Source: pointer.String("*"),
670+
Destination: pointer.String("*"),
671671
Direction: SecurityRuleDirectionInbound,
672672
},
673673
},
@@ -868,7 +868,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
868868
LoadBalancerClassSpec: LoadBalancerClassSpec{
869869
SKU: SKUStandard,
870870
Type: Public,
871-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
871+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
872872
},
873873
},
874874
},
@@ -912,7 +912,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
912912
LoadBalancerClassSpec: LoadBalancerClassSpec{
913913
SKU: SKUStandard,
914914
Type: Internal,
915-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
915+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
916916
},
917917
Name: "cluster-test-internal-lb",
918918
},
@@ -960,7 +960,7 @@ func TestAPIServerLBDefaults(t *testing.T) {
960960
LoadBalancerClassSpec: LoadBalancerClassSpec{
961961
SKU: SKUStandard,
962962
Type: Internal,
963-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
963+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
964964
},
965965
Name: "cluster-test-internal-lb",
966966
},
@@ -1143,11 +1143,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
11431143
BackendPool: BackendPool{
11441144
Name: "cluster-test-outboundBackendPool",
11451145
},
1146-
FrontendIPsCount: to.Int32Ptr(1),
1146+
FrontendIPsCount: pointer.Int32(1),
11471147
LoadBalancerClassSpec: LoadBalancerClassSpec{
11481148
SKU: SKUStandard,
11491149
Type: Public,
1150-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
1150+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
11511151
},
11521152
},
11531153
},
@@ -1324,11 +1324,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
13241324
BackendPool: BackendPool{
13251325
Name: "cluster-test-outboundBackendPool",
13261326
},
1327-
FrontendIPsCount: to.Int32Ptr(1),
1327+
FrontendIPsCount: pointer.Int32(1),
13281328
LoadBalancerClassSpec: LoadBalancerClassSpec{
13291329
SKU: SKUStandard,
13301330
Type: Public,
1331-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
1331+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
13321332
},
13331333
},
13341334
},
@@ -1433,14 +1433,14 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
14331433
Name: "pip-cluster-test-node-outbound",
14341434
},
14351435
}},
1436-
FrontendIPsCount: to.Int32Ptr(1),
1436+
FrontendIPsCount: pointer.Int32(1),
14371437
BackendPool: BackendPool{
14381438
Name: "cluster-test-outboundBackendPool",
14391439
},
14401440
LoadBalancerClassSpec: LoadBalancerClassSpec{
14411441
SKU: SKUStandard,
14421442
Type: Public,
1443-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
1443+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
14441444
},
14451445
Name: "cluster-test",
14461446
},
@@ -1616,12 +1616,12 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
16161616
NetworkSpec: NetworkSpec{
16171617
APIServerLB: LoadBalancerSpec{LoadBalancerClassSpec: LoadBalancerClassSpec{Type: Public}},
16181618
NodeOutboundLB: &LoadBalancerSpec{
1619-
FrontendIPsCount: to.Int32Ptr(2),
1619+
FrontendIPsCount: pointer.Int32(2),
16201620
BackendPool: BackendPool{
16211621
Name: "custom-backend-pool",
16221622
},
16231623
LoadBalancerClassSpec: LoadBalancerClassSpec{
1624-
IdleTimeoutInMinutes: to.Int32Ptr(15),
1624+
IdleTimeoutInMinutes: pointer.Int32(15),
16251625
},
16261626
},
16271627
},
@@ -1656,11 +1656,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
16561656
BackendPool: BackendPool{
16571657
Name: "custom-backend-pool",
16581658
},
1659-
FrontendIPsCount: to.Int32Ptr(2), // we expect the original value to be respected here
1659+
FrontendIPsCount: pointer.Int32(2), // we expect the original value to be respected here
16601660
LoadBalancerClassSpec: LoadBalancerClassSpec{
16611661
SKU: SKUStandard,
16621662
Type: Public,
1663-
IdleTimeoutInMinutes: to.Int32Ptr(15), // we expect the original value to be respected here
1663+
IdleTimeoutInMinutes: pointer.Int32(15), // we expect the original value to be respected here
16641664
},
16651665
Name: "cluster-test",
16661666
},
@@ -1750,11 +1750,11 @@ func TestNodeOutboundLBDefaults(t *testing.T) {
17501750
BackendPool: BackendPool{
17511751
Name: "user-defined-name-outboundBackendPool",
17521752
},
1753-
FrontendIPsCount: to.Int32Ptr(1),
1753+
FrontendIPsCount: pointer.Int32(1),
17541754
LoadBalancerClassSpec: LoadBalancerClassSpec{
17551755
SKU: SKUStandard,
17561756
Type: Public,
1757-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
1757+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
17581758
},
17591759
},
17601760
ControlPlaneOutboundLB: &LoadBalancerSpec{
@@ -1850,9 +1850,9 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
18501850
NetworkSpec: NetworkSpec{
18511851
APIServerLB: LoadBalancerSpec{LoadBalancerClassSpec: LoadBalancerClassSpec{Type: Internal}},
18521852
ControlPlaneOutboundLB: &LoadBalancerSpec{
1853-
FrontendIPsCount: to.Int32Ptr(2),
1853+
FrontendIPsCount: pointer.Int32(2),
18541854
LoadBalancerClassSpec: LoadBalancerClassSpec{
1855-
IdleTimeoutInMinutes: to.Int32Ptr(15),
1855+
IdleTimeoutInMinutes: pointer.Int32(15),
18561856
},
18571857
},
18581858
},
@@ -1888,11 +1888,11 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
18881888
},
18891889
},
18901890
},
1891-
FrontendIPsCount: to.Int32Ptr(2),
1891+
FrontendIPsCount: pointer.Int32(2),
18921892
LoadBalancerClassSpec: LoadBalancerClassSpec{
18931893
SKU: SKUStandard,
18941894
Type: Public,
1895-
IdleTimeoutInMinutes: to.Int32Ptr(15),
1895+
IdleTimeoutInMinutes: pointer.Int32(15),
18961896
},
18971897
},
18981898
},
@@ -1913,7 +1913,7 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
19131913
Name: "custom-outbound-lb",
19141914
},
19151915
LoadBalancerClassSpec: LoadBalancerClassSpec{
1916-
IdleTimeoutInMinutes: to.Int32Ptr(15),
1916+
IdleTimeoutInMinutes: pointer.Int32(15),
19171917
},
19181918
},
19191919
},
@@ -1943,11 +1943,11 @@ func TestControlPlaneOutboundLBDefaults(t *testing.T) {
19431943
},
19441944
},
19451945
},
1946-
FrontendIPsCount: to.Int32Ptr(1),
1946+
FrontendIPsCount: pointer.Int32(1),
19471947
LoadBalancerClassSpec: LoadBalancerClassSpec{
19481948
SKU: SKUStandard,
19491949
Type: Public,
1950-
IdleTimeoutInMinutes: to.Int32Ptr(15),
1950+
IdleTimeoutInMinutes: pointer.Int32(15),
19511951
},
19521952
},
19531953
},

‎api/v1beta1/azurecluster_validation_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,7 +1075,7 @@ func TestValidateNodeOutboundLB(t *testing.T) {
10751075
}, {
10761076
Name: "some-frontend-ip-2",
10771077
}},
1078-
FrontendIPsCount: pointer.Int32Ptr(2),
1078+
FrontendIPsCount: pointer.Int32(2),
10791079
},
10801080
old: &LoadBalancerSpec{
10811081
FrontendIPs: []FrontendIP{{
@@ -1088,7 +1088,7 @@ func TestValidateNodeOutboundLB(t *testing.T) {
10881088
{
10891089
name: "frontend ips count exceeds max value",
10901090
lb: &LoadBalancerSpec{
1091-
FrontendIPsCount: pointer.Int32Ptr(100),
1091+
FrontendIPsCount: pointer.Int32(100),
10921092
},
10931093
wantErr: true,
10941094
expectedErr: field.Error{
@@ -1164,7 +1164,7 @@ func TestValidateControlPlaneNodeOutboundLB(t *testing.T) {
11641164
{
11651165
name: "frontend ips count exceeds max value",
11661166
lb: &LoadBalancerSpec{
1167-
FrontendIPsCount: pointer.Int32Ptr(100),
1167+
FrontendIPsCount: pointer.Int32(100),
11681168
},
11691169
apiServerLB: LoadBalancerSpec{
11701170
LoadBalancerClassSpec: LoadBalancerClassSpec{
@@ -1357,7 +1357,7 @@ func createValidAPIServerLB() LoadBalancerSpec {
13571357

13581358
func createValidNodeOutboundLB() *LoadBalancerSpec {
13591359
return &LoadBalancerSpec{
1360-
FrontendIPsCount: pointer.Int32Ptr(1),
1360+
FrontendIPsCount: pointer.Int32(1),
13611361
}
13621362
}
13631363

‎api/v1beta1/azureclustertemplate_default_test.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ import (
2121
"reflect"
2222
"testing"
2323

24-
"github.com/Azure/go-autorest/autorest/to"
2524
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
25+
"k8s.io/utils/pointer"
2626
)
2727

2828
func TestVnetTemplateDefaults(t *testing.T) {
@@ -472,7 +472,7 @@ func TestAPIServerLBClassDefaults(t *testing.T) {
472472
APIServerLB: LoadBalancerClassSpec{
473473
SKU: SKUStandard,
474474
Type: Public,
475-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
475+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
476476
},
477477
},
478478
},
@@ -509,7 +509,7 @@ func TestAPIServerLBClassDefaults(t *testing.T) {
509509
APIServerLB: LoadBalancerClassSpec{
510510
SKU: SKUStandard,
511511
Type: Internal,
512-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
512+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
513513
},
514514
},
515515
},
@@ -591,7 +591,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
591591
NodeOutboundLB: &LoadBalancerClassSpec{
592592
SKU: SKUStandard,
593593
Type: Public,
594-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
594+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
595595
},
596596
},
597597
},
@@ -728,7 +728,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
728728
NodeOutboundLB: &LoadBalancerClassSpec{
729729
SKU: SKUStandard,
730730
Type: Public,
731-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
731+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
732732
},
733733
},
734734
},
@@ -798,7 +798,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
798798
NodeOutboundLB: &LoadBalancerClassSpec{
799799
SKU: SKUStandard,
800800
Type: Public,
801-
IdleTimeoutInMinutes: to.Int32Ptr(DefaultOutboundRuleIdleTimeoutInMinutes),
801+
IdleTimeoutInMinutes: pointer.Int32(DefaultOutboundRuleIdleTimeoutInMinutes),
802802
},
803803
},
804804
},
@@ -926,7 +926,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
926926
NetworkSpec: NetworkTemplateSpec{
927927
APIServerLB: LoadBalancerClassSpec{Type: Internal},
928928
NodeOutboundLB: &LoadBalancerClassSpec{
929-
IdleTimeoutInMinutes: to.Int32Ptr(15),
929+
IdleTimeoutInMinutes: pointer.Int32(15),
930930
},
931931
},
932932
},
@@ -943,7 +943,7 @@ func TestNodeOutboundLBClassDefaults(t *testing.T) {
943943
NetworkSpec: NetworkTemplateSpec{
944944
APIServerLB: LoadBalancerClassSpec{Type: Internal},
945945
NodeOutboundLB: &LoadBalancerClassSpec{
946-
IdleTimeoutInMinutes: to.Int32Ptr(15),
946+
IdleTimeoutInMinutes: pointer.Int32(15),
947947
SKU: SKUStandard,
948948
Type: Public,
949949
},

0 commit comments

Comments
 (0)