Rebase and fixes

Author: chrischdi

controllers/helpers.go

@@ -1083,12 +1083,12 @@ func RemoveBlockMoveAnnotation(obj metav1.Object) {
 // getAzureClusterFromCluster returns the AzureCluster for a Cluster if the infraRef is an AzureCluster.
 // Returns nil if the infraRef is not an AzureCluster or if the AzureCluster cannot be fetched.
 func getAzureClusterFromCluster(ctx context.Context, c client.Client, cluster *clusterv1.Cluster) *infrav1.AzureCluster {
-	if cluster.Spec.InfrastructureRef == nil || cluster.Spec.InfrastructureRef.Kind != infrav1.AzureClusterKind {
+	if !cluster.Spec.InfrastructureRef.IsDefined() || cluster.Spec.InfrastructureRef.Kind != infrav1.AzureClusterKind {
 		return nil
 	}
 	azureCluster := &infrav1.AzureCluster{}
 	key := client.ObjectKey{
-		Namespace: cluster.Spec.InfrastructureRef.Namespace,
+		Namespace: cluster.Namespace,
 		Name:      cluster.Spec.InfrastructureRef.Name,
 	}
 	if err := c.Get(ctx, key, azureCluster); err != nil {

controllers/helpers_test.go

@@ -1607,10 +1607,10 @@ func TestGetAzureClusterFromCluster(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &corev1.ObjectReference{
-						Kind:      infrav1.AzureClusterKind,
-						Name:      "azure-cluster",
-						Namespace: "default",
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
+						Kind:     infrav1.AzureClusterKind,
+						Name:     "azure-cluster",
+						APIGroup: infrav1.GroupVersion.Group,
 					},
 				},
 			},
@@ -1633,10 +1633,10 @@ func TestGetAzureClusterFromCluster(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &corev1.ObjectReference{
-						Kind:      infrav1.AzureManagedClusterKind,
-						Name:      "azure-managed-cluster",
-						Namespace: "default",
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
+						Kind:     infrav1.AzureManagedClusterKind,
+						Name:     "azure-managed-cluster",
+						APIGroup: infrav1.GroupVersion.Group,
 					},
 				},
 			},
@@ -1648,10 +1648,10 @@ func TestGetAzureClusterFromCluster(t *testing.T) {
 			cluster: &clusterv1.Cluster{
 				ObjectMeta: metav1.ObjectMeta{Name: "cluster", Namespace: "default"},
 				Spec: clusterv1.ClusterSpec{
-					InfrastructureRef: &corev1.ObjectReference{
-						Kind:      infrav1.AzureClusterKind,
-						Name:      "missing-cluster",
-						Namespace: "default",
+					InfrastructureRef: clusterv1.ContractVersionedObjectReference{
+						Kind:     infrav1.AzureClusterKind,
+						Name:     "missing-cluster",
+						APIGroup: infrav1.GroupVersion.Group,
 					},
 				},
 			},