chore: update to match latest CAPI MachinePool ideas

Author: justinsb

exp/api/v1beta1/gcpmachinepool_types.go

@@ -21,7 +21,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 
 	capg "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
-	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
 )
 
 // Constants block.
@@ -50,11 +49,6 @@ type GCPMachinePoolSpec struct {
 	// // +optional
 	// AliasIPRanges []infrav1.AliasIPRange `json:"aliasIPRanges,omitempty"`
 
-	// Not meaningful for MachinePool
-	// // ProviderID is the unique identifier as specified by the cloud provider.
-	// // +optional
-	// ProviderID *string `json:"providerID,omitempty"`
-
 	// ImageFamily is the full reference to a valid image family to be used for this machine.
 	// +optional
 	ImageFamily *string `json:"imageFamily,omitempty"`
@@ -184,45 +178,7 @@ type GCPMachinePoolStatus struct {
 
 	// Conditions defines current service state of the GCPMachinePool.
 	// +optional
-	Conditions clusterv1.Conditions `json:"conditions,omitempty"`
-
-	// FailureReason will be set in the event that there is a terminal problem
-	// reconciling the MachinePool and will contain a succinct value suitable
-	// for machine interpretation.
-	//
-	// This field should not be set for transitive errors that a controller
-	// faces that are expected to be fixed automatically over
-	// time (like service outages), but instead indicate that something is
-	// fundamentally wrong with the MachinePool's spec or the configuration of
-	// the controller, and that manual intervention is required. Examples
-	// of terminal errors would be invalid combinations of settings in the
-	// spec, values that are unsupported by the controller, or the
-	// responsible controller itself being critically misconfigured.
-	//
-	// Any transient errors that occur during the reconciliation of MachinePools
-	// can be added as events to the MachinePool object and/or logged in the
-	// controller's output.
-	// +optional
-	FailureReason *string `json:"failureReason,omitempty"`
-
-	// FailureMessage will be set in the event that there is a terminal problem
-	// reconciling the MachinePool and will contain a more verbose string suitable
-	// for logging and human consumption.
-	//
-	// This field should not be set for transitive errors that a controller
-	// faces that are expected to be fixed automatically over
-	// time (like service outages), but instead indicate that something is
-	// fundamentally wrong with the MachinePool's spec or the configuration of
-	// the controller, and that manual intervention is required. Examples
-	// of terminal errors would be invalid combinations of settings in the
-	// spec, values that are unsupported by the controller, or the
-	// responsible controller itself being critically misconfigured.
-	//
-	// Any transient errors that occur during the reconciliation of MachinePools
-	// can be added as events to the MachinePool object and/or logged in the
-	// controller's output.
-	// +optional
-	FailureMessage *string `json:"failureMessage,omitempty"`
+	Conditions []metav1.Condition `json:"conditions,omitempty"`
 }
 
 // +kubebuilder:object:root=true
@@ -255,16 +211,6 @@ func init() {
 	SchemeBuilder.Register(&GCPMachinePool{}, &GCPMachinePoolList{})
 }
 
-// GetConditions returns the observations of the operational state of the GCPMachinePool resource.
-func (r *GCPMachinePool) GetConditions() clusterv1.Conditions {
-	return r.Status.Conditions
-}
-
-// SetConditions sets the underlying service state of the GCPMachinePool to the predescribed clusterv1.Conditions.
-func (r *GCPMachinePool) SetConditions(conditions clusterv1.Conditions) {
-	r.Status.Conditions = conditions
-}
-
 // GetObjectKind will return the ObjectKind of an GCPMachinePool.
 func (r *GCPMachinePool) GetObjectKind() schema.ObjectKind {
 	return &r.TypeMeta

exp/controllers/gcpmachinepool_controller.go

@@ -38,15 +38,17 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 
 	clusterv1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
+	"sigs.k8s.io/cluster-api/util/annotations"
 	"sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
+	v1beta1conditions "sigs.k8s.io/cluster-api/util/deprecated/v1beta1/conditions"
 	"sigs.k8s.io/cluster-api/util/predicates"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-gcp/api/v1beta1"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud/scope"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/instancegroupmanagers"
 	"sigs.k8s.io/cluster-api-provider-gcp/cloud/services/compute/instancetemplates"
 	expinfrav1 "sigs.k8s.io/cluster-api-provider-gcp/exp/api/v1beta1"
-	"sigs.k8s.io/cluster-api-provider-gcp/pkg/capiutils"
+	exputil "sigs.k8s.io/cluster-api/exp/util"
 	"sigs.k8s.io/controller-runtime/pkg/log"
 )
 
@@ -78,7 +80,7 @@ func (r *GCPMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 
 	// Fetch the CAPI MachinePool
-	machinePool, err := getOwnerMachinePool(ctx, r.Client, gcpMachinePool.ObjectMeta)
+	machinePool, err := exputil.GetOwnerMachinePool(ctx, r.Client, gcpMachinePool.ObjectMeta)
 	if err != nil {
 		return reconcile.Result{}, err
 	}
@@ -96,7 +98,7 @@ func (r *GCPMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	}
 	log = log.WithValues("cluster", klog.KObj(clusterObj))
 
-	if capiutils.IsPaused(clusterObj, gcpMachinePool) {
+	if annotations.IsPaused(clusterObj, gcpMachinePool) {
 		log.Info("GCPMachinePool or linked Cluster is marked as paused. Won't reconcile")
 		return ctrl.Result{}, nil
 	}
@@ -125,12 +127,12 @@ func (r *GCPMachinePoolReconciler) Reconcile(ctx context.Context, req ctrl.Reque
 	// Always close the scope when exiting this function so we can persist any GCPMachine changes.
 	defer func() {
 		// set Ready condition before GCPMachinePool is patched
-		conditions.SetSummary(machinePoolScope.GCPMachinePool,
-			conditions.WithConditions(
+		v1beta1conditions.SetSummary(machinePoolScope.GCPMachinePool,
+			v1beta1conditions.WithConditions(
 				expinfrav1.MIGReadyCondition,
 				expinfrav1.InstanceTemplateReadyCondition,
 			),
-			conditions.WithStepCounterIfOnly(
+			v1beta1conditions.WithStepCounterIfOnly(
 				expinfrav1.MIGReadyCondition,
 				expinfrav1.InstanceTemplateReadyCondition,
 			),

exp/controllers/gcpmanagedmachinepool_controller.go

@@ -199,22 +199,6 @@ func getMachinePoolByName(ctx context.Context, c client.Client, namespace, name
 	return m, nil
 }
 
-// getOwnerMachinePool returns the MachinePool object owning the current resource.
-func getOwnerMachinePool(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*clusterv1.MachinePool, error) {
-	for _, ref := range obj.OwnerReferences {
-		if ref.Kind != "MachinePool" {
-			continue
-		}
-		gv, err := schema.ParseGroupVersion(ref.APIVersion)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-		if gv.Group == clusterv1.GroupVersion.Group {
-			return getMachinePoolByName(ctx, c, obj.Namespace, ref.Name)
-		}
-	}
-	return nil, nil
-}
 
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedmachinepools,verbs=get;list;watch;create;update;patch;delete
 //+kubebuilder:rbac:groups=infrastructure.cluster.x-k8s.io,resources=gcpmanagedmachinepools/status,verbs=get;update;patch
@@ -241,7 +225,7 @@ func (r *GCPManagedMachinePoolReconciler) Reconcile(ctx context.Context, req ctr
 	}
 
 	// Get the machine pool
-	machinePool, err := getOwnerMachinePool(ctx, r.Client, gcpManagedMachinePool.ObjectMeta)
+	machinePool, err := util.GetOwnerMachinePool(ctx, r.Client, gcpManagedMachinePool.ObjectMeta)
 	if err != nil {
 		log.Error(err, "Failed to retrieve owner MachinePool from the API Server")
 		return ctrl.Result{}, err