Remove deprecated code in v1.6

Signed-off-by: Furkat Gofurov <[email protected]>

Author: furkatgofurov7

controllers/noderefutil/providerid.go

@@ -36,9 +36,3 @@ var NodeProviderIDIndex = Index{
 	Field:        index.NodeProviderIDField,
 	ExtractValue: index.NodeByProviderID,
 }
-
-// DefaultIndexes is the default list of indexes on a ClusterCacheTracker.
-//
-// Deprecated: This variable is deprecated and will be removed in a future release of Cluster API.
-// Instead please use `[]Index{NodeProviderIDIndex}`.
-var DefaultIndexes = []Index{NodeProviderIDIndex}

controllers/noderefutil/providerid_test.go

@@ -46,21 +46,3 @@ func Retry(fn wait.ConditionFunc, initialBackoffSec int) error {
 	}
 	return nil
 }
-
-// Poll tries a condition func until it returns true, an error, or the timeout
-// is reached.
-//
-// Deprecated: This function has been deprecated and will be removed in a future release.
-// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
-func Poll(interval, timeout time.Duration, condition wait.ConditionFunc) error {
-	return wait.Poll(interval, timeout, condition)
-}
-
-// PollImmediate tries a condition func until it returns true, an error, or the timeout
-// is reached.
-//
-// Deprecated: This function has been deprecated and will be removed in a future release.
-// Please use utils from "k8s.io/apimachinery/pkg/util/wait" instead.
-func PollImmediate(interval, timeout time.Duration, condition wait.ConditionFunc) error {
-	return wait.PollImmediate(interval, timeout, condition)
-}

controllers/remote/index.go

@@ -467,56 +467,6 @@ func (k KubeAwareAPIVersions) Less(i, j int) bool {
 	return k8sversion.CompareKubeAwareVersionStrings(k[i], k[j]) < 0
 }
 
-// ClusterToObjectsMapper returns a mapper function that gets a cluster and lists all objects for the object passed in
-// and returns a list of requests.
-// NB: The objects are required to have `clusterv1.ClusterNameLabel` applied.
-//
-// Deprecated: This function is deprecated and will be removed in a future release, use ClusterToTypedObjectsMapper instead.
-// The problem with this function is that it uses UnstructuredList to retrieve objects, with the default client configuration
-// this will lead to uncached List calls, which is a major performance issue.
-func ClusterToObjectsMapper(c client.Client, ro client.ObjectList, scheme *runtime.Scheme) (handler.MapFunc, error) {
-	gvk, err := apiutil.GVKForObject(ro, scheme)
-	if err != nil {
-		return nil, err
-	}
-
-	isNamespaced, err := isAPINamespaced(gvk, c.RESTMapper())
-	if err != nil {
-		return nil, err
-	}
-
-	return func(ctx context.Context, o client.Object) []ctrl.Request {
-		cluster, ok := o.(*clusterv1.Cluster)
-		if !ok {
-			return nil
-		}
-
-		listOpts := []client.ListOption{
-			client.MatchingLabels{
-				clusterv1.ClusterNameLabel: cluster.Name,
-			},
-		}
-
-		if isNamespaced {
-			listOpts = append(listOpts, client.InNamespace(cluster.Namespace))
-		}
-
-		list := &unstructured.UnstructuredList{}
-		list.SetGroupVersionKind(gvk)
-		if err := c.List(ctx, list, listOpts...); err != nil {
-			return nil
-		}
-
-		results := []ctrl.Request{}
-		for _, obj := range list.Items {
-			results = append(results, ctrl.Request{
-				NamespacedName: client.ObjectKey{Namespace: obj.GetNamespace(), Name: obj.GetName()},
-			})
-		}
-		return results
-	}, nil
-}
-
 // ClusterToTypedObjectsMapper returns a mapper function that gets a cluster and lists all objects for the object passed in
 // and returns a list of requests.
 // Note: This function uses the passed in typed ObjectList and thus with the default client configuration all list calls