pkg/infrastructure: capi v1beta1 -> v1beta2

Update deprecated v1beta1 capi fields we were using in infra
provisioning.

Author: patrickdillon

pkg/infrastructure/clusterapi/clusterapi.go

@@ -12,13 +12,13 @@ import (
 	"gopkg.in/yaml.v2"
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	utilerrors "k8s.io/apimachinery/pkg/util/errors"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/utils/ptr"
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta2"
 	utilkubeconfig "sigs.k8s.io/cluster-api/util/kubeconfig"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
@@ -234,15 +234,16 @@ func (i *InfraProvider) Provision(ctx context.Context, dir string, parents asset
 					}
 				}
 				for _, capiCluster := range capiClusters {
-					if !capiCluster.Status.InfrastructureReady {
+					infraReadyCond := meta.FindStatusCondition(capiCluster.Status.Conditions, clusterv1.ClusterInfrastructureReadyCondition)
+					if infraReadyCond == nil || infraReadyCond.Status != metav1.ConditionTrue {
 						return false, nil
 					}
 				}
 				return true, nil
 			}); err != nil {
 			// Attempt to find and report falsy conditions in infra cluster if any.
 			if len(capiClusters) > 0 {
-				warnIfFalsyInfraConditions(ctx, capiClusters[0].Spec.InfrastructureRef, cl)
+				warnIfFalsyInfraConditions(ctx, capiClusters[0].Spec.InfrastructureRef, capiutils.Namespace, cl)
 			}
 			if wait.Interrupted(err) {
 				return fileList, fmt.Errorf("infrastructure was not ready within %v", networkTimeout)
@@ -375,7 +376,7 @@ func (i *InfraProvider) Provision(ctx context.Context, dir string, parents asset
 			// Attempt to find and report falsy conditions in infra machines if any.
 			for _, machine := range capiMachines {
 				if machine != nil {
-					warnIfFalsyInfraConditions(ctx, &machine.Spec.InfrastructureRef, cl)
+					warnIfFalsyInfraConditions(ctx, machine.Spec.InfrastructureRef, capiutils.Namespace, cl)
 				}
 			}
 			if wait.Interrupted(err) {
@@ -640,10 +641,6 @@ func checkMachineReady(machine *clusterv1.Machine, requirePublicIP bool) (bool,
 		machine.Status.Phase != string(clusterv1.MachinePhaseRunning) {
 		logrus.Debugf("Machine %s has not yet provisioned: %s", machine.Name, machine.Status.Phase)
 		return false, nil
-	} else if machine.Status.Phase == string(clusterv1.MachinePhaseFailed) {
-		//TODO: We need to update this to use non deprecated field
-		msg := ptr.Deref(machine.Status.FailureMessage, "machine.Status.FailureMessage was not set") //nolint:staticcheck
-		return false, fmt.Errorf("machine %s failed to provision: %s", machine.Name, msg)
 	}
 	logrus.Debugf("Machine %s has status: %s", machine.Name, machine.Status.Phase)
 	return hasRequiredIP(machine, requirePublicIP), nil
@@ -673,12 +670,12 @@ func hasRequiredIP(machine *clusterv1.Machine, requirePublicIP bool) bool {
 // in a provider-agnostic way from the "status.condition" field, which should be present in all providers.
 // https://cluster-api.sigs.k8s.io/developer/providers/contracts/infra-cluster#infracluster-conditions
 // https://cluster-api.sigs.k8s.io/developer/providers/contracts/infra-machine#inframachine-conditions
-func gatherInfraConditions(ctx context.Context, objRef *corev1.ObjectReference, cl client.Client) (clusterv1.Conditions, error) {
+func gatherInfraConditions(ctx context.Context, objRef clusterv1.ContractVersionedObjectReference, namespace string, cl client.Client) (clusterv1.Conditions, error) {
 	unstructuredObj := &unstructured.Unstructured{}
-	unstructuredObj.SetGroupVersionKind(objRef.GroupVersionKind())
+	unstructuredObj.SetGroupVersionKind(objRef.GroupKind().WithVersion(""))
 
 	if err := cl.Get(ctx, client.ObjectKey{
-		Namespace: objRef.Namespace,
+		Namespace: namespace,
 		Name:      objRef.Name,
 	}, unstructuredObj); err != nil {
 		return nil, err
@@ -700,12 +697,11 @@ func gatherInfraConditions(ctx context.Context, objRef *corev1.ObjectReference,
 
 // warnIfFalsyInfraConditions logs warning messages for any conditions that are not "True"
 // in the infra cluster or machine status.
-func warnIfFalsyInfraConditions(ctx context.Context, objRef *corev1.ObjectReference, cl client.Client) {
-	apiVersion, kind := objRef.GroupVersionKind().ToAPIVersionAndKind()
-	objInfo := fmt.Sprintf("apiVersion=%s, kind=%s, namespace=%s, name=%s", apiVersion, kind, objRef.Namespace, objRef.Name)
+func warnIfFalsyInfraConditions(ctx context.Context, objRef clusterv1.ContractVersionedObjectReference, namespace string, cl client.Client) {
+	objInfo := fmt.Sprintf("apiGroup=%s, kind=%s, namespace=%s, name=%s", objRef.APIGroup, objRef.Kind, namespace, objRef.Name)
 
 	logrus.Infof("Gathering conditions for %s", objInfo)
-	conditions, err := gatherInfraConditions(ctx, objRef, cl)
+	conditions, err := gatherInfraConditions(ctx, objRef, namespace, cl)
 	if err != nil {
 		logrus.Warnf("Failed to gather conditions: %s", err.Error())
 		return