fix tests broken by CAPI upgrade

Author: AshleyDumaine

internal/controller/linodecluster_controller_test.go

@@ -63,6 +63,9 @@ var _ = Describe("cluster-lifecycle", Ordered, Label("cluster", "cluster-lifecyc
 	linodeCluster := infrav1alpha2.LinodeCluster{
 		ObjectMeta: metadata,
 		Spec: infrav1alpha2.LinodeClusterSpec{
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Port: int32(controlPlaneEndpointPort),
+			},
 			Region: "us-ord",
 			VPCRef: &corev1.ObjectReference{Name: "vpctest", Namespace: defaultNamespace},
 		},
@@ -371,6 +374,10 @@ var _ = Describe("cluster-lifecycle-dns", Ordered, Label("cluster", "cluster-lif
 		ObjectMeta: metadata,
 		Spec: infrav1alpha2.LinodeClusterSpec{
 			Region: "us-ord",
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Host: controlPlaneEndpointHost,
+				Port: int32(controlPlaneEndpointPort),
+			},
 			Network: infrav1alpha2.NetworkSpec{
 				LoadBalancerType:          "dns",
 				DNSRootDomain:             "lkedevs.net",
@@ -621,11 +628,21 @@ var _ = Describe("dns-override-endpoint", Ordered, Label("cluster", "dns-overrid
 	}
 	cluster := clusterv1.Cluster{
 		ObjectMeta: metadata,
+		Spec: clusterv1.ClusterSpec{
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Host: controlPlaneEndpointHost,
+				Port: int32(controlPlaneEndpointPort),
+			},
+		},
 	}
 	linodeCluster := infrav1alpha2.LinodeCluster{
 		ObjectMeta: metadata,
 		Spec: infrav1alpha2.LinodeClusterSpec{
 			Region: "us-ord",
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Host: controlPlaneEndpointHost,
+				Port: int32(controlPlaneEndpointPort),
+			},
 			Network: infrav1alpha2.NetworkSpec{
 				ApiserverLoadBalancerPort: controlPlaneEndpointPort,
 				LoadBalancerType:          "dns",
@@ -744,7 +761,10 @@ var _ = Describe("cluster-with-direct-vpcid", Ordered, Label("cluster", "direct-
 		ObjectMeta: metadata,
 		Spec: infrav1alpha2.LinodeClusterSpec{
 			Region: "us-ord",
-			VPCID:  ptr.To(12345),
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Port: 6443,
+			},
+			VPCID: ptr.To(12345),
 		},
 	}
 

internal/controller/linodemachine_controller_test.go

@@ -72,6 +72,9 @@ var _ = Describe("create", Label("machine", "create"), func() {
 			Namespace: defaultNamespace,
 		},
 		Spec: infrav1alpha2.LinodeClusterSpec{
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Port: 6443,
+			},
 			Network: infrav1alpha2.NetworkSpec{
 				NodeBalancerID:                ptr.To(1),
 				ApiserverNodeBalancerConfigID: ptr.To(2),
@@ -1319,6 +1322,9 @@ var _ = Describe("machine-lifecycle", Ordered, Label("machine", "machine-lifecyc
 			Labels:    make(map[string]string),
 		},
 		Spec: infrav1alpha2.LinodeClusterSpec{
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Port: 6443,
+			},
 			Network: infrav1alpha2.NetworkSpec{
 				NodeBalancerID:                ptr.To(1),
 				ApiserverNodeBalancerConfigID: ptr.To(2),
@@ -1640,6 +1646,9 @@ var _ = Describe("machine-update", Ordered, Label("machine", "machine-update"),
 			Labels:    make(map[string]string),
 		},
 		Spec: infrav1alpha2.LinodeClusterSpec{
+			ControlPlaneEndpoint: clusterv1.APIEndpoint{
+				Port: 6443,
+			},
 			Network: infrav1alpha2.NetworkSpec{
 				NodeBalancerID:                ptr.To(1),
 				ApiserverNodeBalancerConfigID: ptr.To(2),

util/helpers.go

@@ -105,14 +105,15 @@ func IsLinodePrivateIP(ipAddress string) bool {
 func SetOwnerReferenceToLinodeCluster(ctx context.Context, k8sclient client.Client, cluster *clusterv1.Cluster, obj client.Object, scheme *runtime.Scheme) error {
 	logger := log.Log.WithName("SetOwnerReferenceToLinodeCluster")
 
-	if cluster == nil {
+	if cluster == nil || cluster.Spec.InfrastructureRef.Name == "" {
 		logger.Info("the Cluster is nil, cannot fetch LinodeCluster")
 		return nil
 	}
 
 	var linodeCluster infrav1alpha2.LinodeCluster
 	key := types.NamespacedName{
-		Name: cluster.Spec.InfrastructureRef.Name,
+		Name:      cluster.Spec.InfrastructureRef.Name,
+		Namespace: cluster.Namespace,
 	}
 	if err := k8sclient.Get(ctx, key, &linodeCluster); err != nil {
 		if client.IgnoreNotFound(err) != nil {