Skip to content

Commit 6df858d

Browse files
Amulyam24Amulyam24
authored
Update cluster-api to v1.4.0-beta.2 (#1157)
1 parent e1a3d3e commit 6df858d

26 files changed

+274
-437
lines changed

‎cloud/scope/common_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ func newBootstrapSecret(clusterName, machineName string) *corev1.Secret {
7878
return &corev1.Secret{
7979
ObjectMeta: metav1.ObjectMeta{
8080
Labels: map[string]string{
81-
capiv1beta1.ClusterLabelName: clusterName,
81+
capiv1beta1.ClusterNameLabel: clusterName,
8282
},
8383
Name: machineName,
8484
Namespace: "default",

‎cloud/scope/machine_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ func newVPCMachine(clusterName, machineName string) *infrav1beta2.IBMVPCMachine
4343
return &infrav1beta2.IBMVPCMachine{
4444
ObjectMeta: metav1.ObjectMeta{
4545
Labels: map[string]string{
46-
capiv1beta1.ClusterLabelName: clusterName,
46+
capiv1beta1.ClusterNameLabel: clusterName,
4747
},
4848
Name: machineName,
4949
Namespace: "default",
@@ -213,7 +213,7 @@ func TestCreateMachine(t *testing.T) {
213213
secret := &corev1.Secret{
214214
ObjectMeta: metav1.ObjectMeta{
215215
Labels: map[string]string{
216-
capiv1beta1.ClusterLabelName: clusterName,
216+
capiv1beta1.ClusterNameLabel: clusterName,
217217
},
218218
Name: machineName,
219219
Namespace: "default",

‎cloud/scope/powervs_machine_test.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ func newPowerVSMachine(clusterName, machineName string, imageRef *string, networ
6161
return &infrav1beta2.IBMPowerVSMachine{
6262
ObjectMeta: metav1.ObjectMeta{
6363
Labels: map[string]string{
64-
capiv1beta1.ClusterLabelName: clusterName,
64+
capiv1beta1.ClusterNameLabel: clusterName,
6565
},
6666
Name: machineName,
6767
Namespace: "default",
@@ -101,7 +101,7 @@ func setupPowerVSMachineScope(clusterName string, machineName string, imageID *s
101101

102102
func newPowerVSInstance(name, networkID, mac string) *models.PVMInstance {
103103
return &models.PVMInstance{
104-
ServerName: pointer.StringPtr(name),
104+
ServerName: pointer.String(name),
105105
Networks: []*models.PVMInstanceNetwork{
106106
{
107107
NetworkID: networkID,
@@ -114,21 +114,21 @@ func newPowerVSInstance(name, networkID, mac string) *models.PVMInstance {
114114
func newDHCPServer(serverID, networkID string) models.DHCPServers {
115115
return models.DHCPServers{
116116
&models.DHCPServer{
117-
ID: pointer.StringPtr(serverID),
117+
ID: pointer.String(serverID),
118118
Network: &models.DHCPServerNetwork{
119-
ID: pointer.StringPtr(networkID),
119+
ID: pointer.String(networkID),
120120
},
121121
},
122122
}
123123
}
124124

125125
func newDHCPServerDetails(serverID, leaseIP, instanceMac string) *models.DHCPServerDetail {
126126
return &models.DHCPServerDetail{
127-
ID: pointer.StringPtr(serverID),
127+
ID: pointer.String(serverID),
128128
Leases: []*models.DHCPServerLeases{
129129
{
130-
InstanceIP: pointer.StringPtr(leaseIP),
131-
InstanceMacAddress: pointer.StringPtr(instanceMac),
130+
InstanceIP: pointer.String(leaseIP),
131+
InstanceMacAddress: pointer.String(instanceMac),
132132
},
133133
},
134134
}
@@ -297,7 +297,7 @@ func TestCreateMachinePVS(t *testing.T) {
297297
secret := &corev1.Secret{
298298
ObjectMeta: metav1.ObjectMeta{
299299
Labels: map[string]string{
300-
capiv1beta1.ClusterLabelName: clusterName,
300+
capiv1beta1.ClusterNameLabel: clusterName,
301301
},
302302
Name: machineName,
303303
Namespace: "default",
@@ -490,7 +490,7 @@ func TestSetAddresses(t *testing.T) {
490490
ExternalIP: "10.11.2.3",
491491
},
492492
},
493-
ServerName: pointer.StringPtr(instanceName),
493+
ServerName: pointer.String(instanceName),
494494
},
495495
expectedNodeAddress: append(defaultExpectedMachineAddress, corev1.NodeAddress{
496496
Type: corev1.NodeExternalIP,
@@ -510,7 +510,7 @@ func TestSetAddresses(t *testing.T) {
510510
IPAddress: "192.168.10.3",
511511
},
512512
},
513-
ServerName: pointer.StringPtr(instanceName),
513+
ServerName: pointer.String(instanceName),
514514
},
515515
expectedNodeAddress: append(defaultExpectedMachineAddress, corev1.NodeAddress{
516516
Type: corev1.NodeInternalIP,
@@ -531,7 +531,7 @@ func TestSetAddresses(t *testing.T) {
531531
ExternalIP: "10.11.2.3",
532532
},
533533
},
534-
ServerName: pointer.StringPtr(instanceName),
534+
ServerName: pointer.String(instanceName),
535535
},
536536
expectedNodeAddress: append(defaultExpectedMachineAddress, []corev1.NodeAddress{
537537
{
@@ -553,7 +553,7 @@ func TestSetAddresses(t *testing.T) {
553553
return mockPowerVSClient
554554
},
555555
pvmInstance: &models.PVMInstance{
556-
ServerName: pointer.StringPtr(instanceName),
556+
ServerName: pointer.String(instanceName),
557557
},
558558
expectedNodeAddress: defaultExpectedMachineAddress,
559559
dhcpCacheStoreFunc: defaultDhcpCacheStoreFunc,
@@ -565,8 +565,8 @@ func TestSetAddresses(t *testing.T) {
565565
networks := &models.Networks{
566566
Networks: []*models.NetworkReference{
567567
{
568-
NetworkID: pointer.StringPtr("test-ID"),
569-
Name: pointer.StringPtr("test-name"),
568+
NetworkID: pointer.String("test-ID"),
569+
Name: pointer.String("test-name"),
570570
},
571571
},
572572
}
@@ -707,7 +707,7 @@ func TestSetAddresses(t *testing.T) {
707707
defer ctrl.Finish()
708708

709709
mockPowerVSClient := tc.powerVSClientFunc(ctrl)
710-
scope := setupPowerVSMachineScope("test-cluster", "test-machine-0", pointer.StringPtr("test-image-ID"), &networkID, tc.setNetworkID, mockPowerVSClient)
710+
scope := setupPowerVSMachineScope("test-cluster", "test-machine-0", pointer.String("test-image-ID"), &networkID, tc.setNetworkID, mockPowerVSClient)
711711
scope.DHCPIPCacheStore = tc.dhcpCacheStoreFunc()
712712
scope.SetAddresses(tc.pvmInstance)
713713
g.Expect(scope.IBMPowerVSMachine.Status.Addresses).To(Equal(tc.expectedNodeAddress))

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmpowervsclusters.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsclustertemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmpowervsclustertemplates.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsimages.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmpowervsimages.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmpowervsmachines.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmpowervsmachinetemplates.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmpowervsmachinetemplates.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcclusters.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmvpcclusters.infrastructure.cluster.x-k8s.io
99
spec:

‎config/crd/bases/infrastructure.cluster.x-k8s.io_ibmvpcmachines.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: ibmvpcmachines.infrastructure.cluster.x-k8s.io
99
spec:

0 commit comments

Comments
 (0)