Skip to content

Commit 264ac1e

Browse files
Amulyam24Amulyam24
authored
Update cluster-api version to v1.11.0-rc.0 (#2456)
1 parent 8cb3dd5 commit 264ac1e

27 files changed

+183
-186
lines changed

‎cloud/scope/cluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -714,8 +714,8 @@ func (s *ClusterScope) Close() error {
714714

715715
// APIServerPort returns the APIServerPort to use when creating the ControlPlaneEndpoint.
716716
func (s *ClusterScope) APIServerPort() int32 {
717-
if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
718-
return *s.Cluster.Spec.ClusterNetwork.APIServerPort
717+
if s.Cluster.Spec.ClusterNetwork.APIServerPort > 0 {
718+
return s.Cluster.Spec.ClusterNetwork.APIServerPort
719719
}
720720
return infrav1.DefaultAPIServerPort
721721
}

‎cloud/scope/machine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1150,8 +1150,8 @@ func (m *MachineScope) TagResource(tagName string, resourceCRN string) error {
11501150

11511151
// APIServerPort returns the APIServerPort.
11521152
func (m *MachineScope) APIServerPort() int32 {
1153-
if m.Cluster.Spec.ClusterNetwork != nil && m.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
1154-
return *m.Cluster.Spec.ClusterNetwork.APIServerPort
1153+
if m.Cluster.Spec.ClusterNetwork.APIServerPort > 0 {
1154+
return m.Cluster.Spec.ClusterNetwork.APIServerPort
11551155
}
11561156
return infrav1.DefaultAPIServerPort
11571157
}

‎cloud/scope/powervs_cluster.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -380,8 +380,8 @@ func (s *PowerVSClusterScope) InfraCluster() string {
380380

381381
// APIServerPort returns the APIServerPort to use when creating the ControlPlaneEndpoint.
382382
func (s *PowerVSClusterScope) APIServerPort() int32 {
383-
if s.Cluster.Spec.ClusterNetwork != nil && s.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
384-
return *s.Cluster.Spec.ClusterNetwork.APIServerPort
383+
if s.Cluster.Spec.ClusterNetwork.APIServerPort > 0 {
384+
return s.Cluster.Spec.ClusterNetwork.APIServerPort
385385
}
386386
return infrav1.DefaultAPIServerPort
387387
}

‎cloud/scope/powervs_cluster_test.go

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1421,8 +1421,8 @@ func TestReconcileLoadBalancers(t *testing.T) {
14211421
},
14221422
Cluster: &clusterv1.Cluster{
14231423
Spec: clusterv1.ClusterSpec{
1424-
ClusterNetwork: &clusterv1.ClusterNetwork{
1425-
APIServerPort: &clusterNetworkAPIServerPort,
1424+
ClusterNetwork: clusterv1.ClusterNetwork{
1425+
APIServerPort: clusterNetworkAPIServerPort,
14261426
},
14271427
},
14281428
},
@@ -1472,8 +1472,8 @@ func TestReconcileLoadBalancers(t *testing.T) {
14721472
},
14731473
Cluster: &clusterv1.Cluster{
14741474
Spec: clusterv1.ClusterSpec{
1475-
ClusterNetwork: &clusterv1.ClusterNetwork{
1476-
APIServerPort: &clusterAPIServerPort,
1475+
ClusterNetwork: clusterv1.ClusterNetwork{
1476+
APIServerPort: clusterAPIServerPort,
14771477
},
14781478
},
14791479
},
@@ -1523,8 +1523,8 @@ func TestReconcileLoadBalancers(t *testing.T) {
15231523
},
15241524
Cluster: &clusterv1.Cluster{
15251525
Spec: clusterv1.ClusterSpec{
1526-
ClusterNetwork: &clusterv1.ClusterNetwork{
1527-
APIServerPort: &clusterAPIServerPort,
1526+
ClusterNetwork: clusterv1.ClusterNetwork{
1527+
APIServerPort: clusterAPIServerPort,
15281528
},
15291529
},
15301530
},
@@ -1671,8 +1671,8 @@ func TestCreateLoadbalancer(t *testing.T) {
16711671
},
16721672
Cluster: &clusterv1.Cluster{
16731673
Spec: clusterv1.ClusterSpec{
1674-
ClusterNetwork: &clusterv1.ClusterNetwork{
1675-
APIServerPort: &clusterAPIServerPort,
1674+
ClusterNetwork: clusterv1.ClusterNetwork{
1675+
APIServerPort: clusterAPIServerPort,
16761676
},
16771677
},
16781678
},
@@ -1730,8 +1730,8 @@ func TestCreateLoadbalancer(t *testing.T) {
17301730
},
17311731
Cluster: &clusterv1.Cluster{
17321732
Spec: clusterv1.ClusterSpec{
1733-
ClusterNetwork: &clusterv1.ClusterNetwork{
1734-
APIServerPort: &clusterAPIServerPort,
1733+
ClusterNetwork: clusterv1.ClusterNetwork{
1734+
APIServerPort: clusterAPIServerPort,
17351735
},
17361736
},
17371737
},
@@ -1770,8 +1770,8 @@ func TestCheckLoadBalancerPort(t *testing.T) {
17701770
clusterScope := PowerVSClusterScope{
17711771
Cluster: &clusterv1.Cluster{
17721772
Spec: clusterv1.ClusterSpec{
1773-
ClusterNetwork: &clusterv1.ClusterNetwork{
1774-
APIServerPort: ptr.To(int32(port)),
1773+
ClusterNetwork: clusterv1.ClusterNetwork{
1774+
APIServerPort: int32(port),
17751775
},
17761776
},
17771777
},
@@ -1792,8 +1792,8 @@ func TestCheckLoadBalancerPort(t *testing.T) {
17921792
clusterScope := PowerVSClusterScope{
17931793
Cluster: &clusterv1.Cluster{
17941794
Spec: clusterv1.ClusterSpec{
1795-
ClusterNetwork: &clusterv1.ClusterNetwork{
1796-
APIServerPort: ptr.To(int32(8080)),
1795+
ClusterNetwork: clusterv1.ClusterNetwork{
1796+
APIServerPort: int32(8080),
17971797
},
17981798
},
17991799
},
@@ -2555,7 +2555,7 @@ func TestReconcileVPC(t *testing.T) {
25552555

25562556
clusterScope := PowerVSClusterScope{
25572557
IBMVPCClient: mockVPC,
2558-
Cluster: &clusterv1.Cluster{Spec: clusterv1.ClusterSpec{ClusterNetwork: nil}},
2558+
Cluster: &clusterv1.Cluster{},
25592559
IBMPowerVSCluster: &infrav1.IBMPowerVSCluster{Spec: infrav1.IBMPowerVSClusterSpec{
25602560
ResourceGroup: &infrav1.IBMPowerVSResourceReference{ID: ptr.To("resourceGroupID")}}},
25612561
}
@@ -2712,7 +2712,7 @@ func TestPowerVSScopeCreateVPC(t *testing.T) {
27122712

27132713
clusterScope := PowerVSClusterScope{
27142714
IBMVPCClient: mockVPC,
2715-
Cluster: &clusterv1.Cluster{Spec: clusterv1.ClusterSpec{ClusterNetwork: nil}},
2715+
Cluster: &clusterv1.Cluster{},
27162716
IBMPowerVSCluster: &infrav1.IBMPowerVSCluster{Spec: infrav1.IBMPowerVSClusterSpec{
27172717
ResourceGroup: &infrav1.IBMPowerVSResourceReference{ID: ptr.To("resourceGroupID")}}},
27182718
}
@@ -2732,7 +2732,7 @@ func TestPowerVSScopeCreateVPC(t *testing.T) {
27322732

27332733
clusterScope := PowerVSClusterScope{
27342734
IBMVPCClient: mockVPC,
2735-
Cluster: &clusterv1.Cluster{Spec: clusterv1.ClusterSpec{ClusterNetwork: nil}},
2735+
Cluster: &clusterv1.Cluster{},
27362736
IBMPowerVSCluster: &infrav1.IBMPowerVSCluster{Spec: infrav1.IBMPowerVSClusterSpec{
27372737
ResourceGroup: &infrav1.IBMPowerVSResourceReference{ID: ptr.To("resourceGroupID")}}},
27382738
}

‎cloud/scope/powervs_machine.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1120,8 +1120,8 @@ func (m *PowerVSMachineScope) CreateVPCLoadBalancerPoolMember(ctx context.Contex
11201120

11211121
// APIServerPort returns the APIServerPort.
11221122
func (m *PowerVSMachineScope) APIServerPort() int32 {
1123-
if m.Cluster.Spec.ClusterNetwork != nil && m.Cluster.Spec.ClusterNetwork.APIServerPort != nil {
1124-
return *m.Cluster.Spec.ClusterNetwork.APIServerPort
1123+
if m.Cluster.Spec.ClusterNetwork.APIServerPort > 0 {
1124+
return m.Cluster.Spec.ClusterNetwork.APIServerPort
11251125
}
11261126
return infrav1.DefaultAPIServerPort
11271127
}

‎cloud/scope/powervs_machine_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ func TestAPIServerPort(t *testing.T) {
146146
machineScope: PowerVSMachineScope{
147147
Cluster: &clusterv1.Cluster{
148148
Spec: clusterv1.ClusterSpec{
149-
ClusterNetwork: &clusterv1.ClusterNetwork{
150-
APIServerPort: ptr.To(int32(6445)),
149+
ClusterNetwork: clusterv1.ClusterNetwork{
150+
APIServerPort: int32(6445),
151151
},
152152
},
153153
},

‎controllers/ibmpowervsmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ func (r *IBMPowerVSMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re
163163
return ctrl.Result{}, err
164164
}
165165

166-
if cluster.Spec.InfrastructureRef == nil {
166+
if !cluster.Spec.InfrastructureRef.IsDefined() {
167167
log.Info("Cluster infrastructureRef is not available yet")
168168
return ctrl.Result{}, nil
169169
}

‎controllers/ibmpowervsmachine_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ func TestIBMPowerVSMachineReconciler_Reconcile(t *testing.T) {
152152
ObjectMeta: metav1.ObjectMeta{
153153
Name: "capi-test-2"},
154154
Spec: clusterv1.ClusterSpec{
155-
InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
155+
InfrastructureRef: clusterv1.ContractVersionedObjectReference{
156156
Name: "powervs-cluster"}}},
157157
expectError: false,
158158
},
@@ -189,7 +189,7 @@ func TestIBMPowerVSMachineReconciler_Reconcile(t *testing.T) {
189189
ObjectMeta: metav1.ObjectMeta{
190190
Name: "capi-test-3"},
191191
Spec: clusterv1.ClusterSpec{
192-
InfrastructureRef: &clusterv1.ContractVersionedObjectReference{Name: "powervs-cluster"}}},
192+
InfrastructureRef: clusterv1.ContractVersionedObjectReference{Name: "powervs-cluster"}}},
193193
powervsCluster: &infrav1.IBMPowerVSCluster{
194194
ObjectMeta: metav1.ObjectMeta{Name: "powervs-cluster"},
195195
Spec: infrav1.IBMPowerVSClusterSpec{

‎controllers/ibmvpccluster_controller_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ func TestIBMVPCClusterReconciler_reconcile(t *testing.T) {
260260
t.Cleanup(teardown)
261261
clusterScope.IBMVPCCluster.Finalizers = []string{infrav1.ClusterFinalizer}
262262
port := int32(412)
263-
clusterScope.Cluster.Spec.ClusterNetwork = &clusterv1.ClusterNetwork{APIServerPort: &port}
263+
clusterScope.Cluster.Spec.ClusterNetwork = clusterv1.ClusterNetwork{APIServerPort: port}
264264
mockvpc.EXPECT().ListVpcs(listVpcsOptions).Return(vpclist, response, nil)
265265
mockvpc.EXPECT().ListSubnets(subnetOptions).Return(subnets, response, nil)
266266
mockvpc.EXPECT().ListLoadBalancers(loadBalancerOptions).Return(loadBalancers, response, nil)
@@ -378,7 +378,7 @@ func TestIBMVPCClusterLBReconciler_reconcile(t *testing.T) {
378378
t.Cleanup(mockController.Finish)
379379
clusterScope.IBMVPCCluster.Finalizers = []string{infrav1.ClusterFinalizer}
380380
port := int32(412)
381-
clusterScope.Cluster.Spec.ClusterNetwork = &clusterv1.ClusterNetwork{APIServerPort: &port}
381+
clusterScope.Cluster.Spec.ClusterNetwork = clusterv1.ClusterNetwork{APIServerPort: port}
382382
mockvpc.EXPECT().ListVpcs(&vpcv1.ListVpcsOptions{}).Return(vpclist, &core.DetailedResponse{}, nil)
383383
mockvpc.EXPECT().ListSubnets(&vpcv1.ListSubnetsOptions{}).Return(subnets, &core.DetailedResponse{}, nil)
384384
mockvpc.EXPECT().ListLoadBalancers(&vpcv1.ListLoadBalancersOptions{}).Return(loadBalancerCollection, &core.DetailedResponse{}, nil)

‎controllers/ibmvpcmachine_controller_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func TestIBMVPCMachineReconciler_Reconcile(t *testing.T) {
146146
ObjectMeta: metav1.ObjectMeta{
147147
Name: "capi-test-2"},
148148
Spec: clusterv1.ClusterSpec{
149-
InfrastructureRef: &clusterv1.ContractVersionedObjectReference{
149+
InfrastructureRef: clusterv1.ContractVersionedObjectReference{
150150
Name: "vpc-cluster"}}},
151151
expectError: false,
152152
},

0 commit comments

Comments
 (0)