fixup! chore: inline v1beta1 helper utils to enable upgrade

Author: justinsb

pkg/capiutils/predicates.go

@@ -14,6 +14,11 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
+// Package capiutils contains utility functions for working with Cluster API resources.
+// These have mostly been inlined as part of the CAPI 1.10 -> 1.11 upgrade,
+// and should be removed when we switch to reading CAPI v1beta2 objects.
+//
+// Deprecated: This package is deprecated and is going to be removed when support for v1beta1 will be dropped.
 package capiutils
 
 import (
@@ -33,7 +38,6 @@ import (
 
 // ClusterUpdateInfraReady returns a predicate that returns true for an update event when a cluster has Status.InfrastructureReady changed from false to true
 // it also returns true if the resource provided is not a Cluster to allow for use with controller-runtime NewControllerManagedBy.
-// Deprecated: replace with predicates.ClusterUpdateInfraReady when we move to v1beta2
 func ClusterUpdateInfraReady(scheme *runtime.Scheme, logger logr.Logger) predicate.Funcs {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
@@ -65,7 +69,6 @@ func ClusterUpdateInfraReady(scheme *runtime.Scheme, logger logr.Logger) predica
 }
 
 // ClusterPausedTransitions returns a predicate that returns true for an update event when a cluster has Spec.Paused changed.
-// Deprecated: replace with predicates.ClusterPausedTransitions when we move to v1beta2
 func ClusterPausedTransitions(scheme *runtime.Scheme, logger logr.Logger) predicate.Funcs {
 	return predicate.Funcs{
 		UpdateFunc: func(e event.UpdateEvent) bool {
@@ -114,8 +117,6 @@ func ClusterPausedTransitions(scheme *runtime.Scheme, logger logr.Logger) predic
 //	    handler.EnqueueRequestsFromMapFunc(clusterToMachines)
 //	    predicates.ClusterPausedTransitionsOrInfrastructureReady(mgr.GetScheme(), r.Log),
 //	)
-//
-// Deprecated: replace with predicates.ClusterPausedTransitionsOrInfrastructureReady when we move to v1beta2
 func ClusterPausedTransitionsOrInfrastructureReady(scheme *runtime.Scheme, logger logr.Logger) predicate.Funcs {
 	log := logger.WithValues("predicate", "ClusterPausedTransitionsOrInfrastructureReady")
 

pkg/capiutils/utils.go

@@ -30,14 +30,12 @@ import (
 )
 
 // IsControlPlaneMachine checks machine is a control plane node.
-// Deprecated: Replace with util.IsControlPlaneMachine when we move to capi v1.11
 func IsControlPlaneMachine(machine *capiv1beta1.Machine) bool {
 	_, ok := machine.Labels[capiv1beta1.MachineControlPlaneLabel]
 	return ok
 }
 
 // GetOwnerCluster returns the Cluster object owning the current resource.
-// Deprecated: Replace with util.IsControlPlaneMachine when we move to capi v1.11
 func GetOwnerCluster(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*capiv1beta1.Cluster, error) {
 	for _, ref := range obj.GetOwnerReferences() {
 		if ref.Kind != "Cluster" {
@@ -55,7 +53,6 @@ func GetOwnerCluster(ctx context.Context, c client.Client, obj metav1.ObjectMeta
 }
 
 // GetClusterFromMetadata returns the Cluster object (if present) using the object metadata.
-// Deprecated: Replace with util.GetClusterFromMetadata when we move to capi v1.11
 func GetClusterFromMetadata(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*capiv1beta1.Cluster, error) {
 	if obj.Labels[capiv1beta1.ClusterNameLabel] == "" {
 		return nil, errors.WithStack(util.ErrNoCluster)
@@ -64,7 +61,6 @@ func GetClusterFromMetadata(ctx context.Context, c client.Client, obj metav1.Obj
 }
 
 // GetClusterByName finds and return a Cluster object using the specified params.
-// Deprecated: Replace with util.GetClusterByName when we move to capi v1.11
 func GetClusterByName(ctx context.Context, c client.Client, namespace, name string) (*capiv1beta1.Cluster, error) {
 	cluster := &capiv1beta1.Cluster{}
 	key := client.ObjectKey{
@@ -80,7 +76,6 @@ func GetClusterByName(ctx context.Context, c client.Client, namespace, name stri
 }
 
 // IsPaused returns true if the Cluster is paused or the object has the `paused` annotation.
-// Deprecated: Replace with annotations.IsPaused when we move to capi v1.11
 func IsPaused(cluster *capiv1beta1.Cluster, o metav1.Object) bool {
 	if cluster.Spec.Paused {
 		return true
@@ -89,7 +84,6 @@ func IsPaused(cluster *capiv1beta1.Cluster, o metav1.Object) bool {
 }
 
 // GetOwnerMachine returns the Machine object owning the current resource.
-// Deprecated: Replace with util.GetOwnerMachine when we move to capi v1.11
 func GetOwnerMachine(ctx context.Context, c client.Client, obj metav1.ObjectMeta) (*capiv1beta1.Machine, error) {
 	for _, ref := range obj.GetOwnerReferences() {
 		gv, err := schema.ParseGroupVersion(ref.APIVersion)
@@ -104,7 +98,6 @@ func GetOwnerMachine(ctx context.Context, c client.Client, obj metav1.ObjectMeta
 }
 
 // GetMachineByName finds and return a Machine object using the specified params.
-// Deprecated: Replace with util.GetMachineByName when we move to capi v1.11
 func GetMachineByName(ctx context.Context, c client.Client, namespace, name string) (*capiv1beta1.Machine, error) {
 	m := &capiv1beta1.Machine{}
 	key := client.ObjectKey{Name: name, Namespace: namespace}