🌱 refactor: replace slower and inefficient sorting functions

api/bootstrap/kubeadm/v1beta2/conversion.go

@@ -17,7 +17,7 @@ limitations under the License.
 package v1beta2
 
 import (
-	"sort"
+	"slices"
 )
 
 func (*KubeadmConfig) Hub()         {}
@@ -38,11 +38,17 @@ func ConvertToArgs(in map[string]string) []Arg {
 	for k, v := range in {
 		args = append(args, Arg{Name: k, Value: v})
 	}
-	sort.Slice(args, func(i, j int) bool {
-		if args[i].Name == args[j].Name {
-			return args[i].Value < args[j].Value
+	slices.SortFunc(args, func(i, j Arg) int {
+		if i.Name == j.Name {
+			if i.Value < j.Value {
+				return 1
+			}
+			return -1
 		}
-		return args[i].Name < args[j].Name
+		if i.Name < j.Name {
+			return 1
+		}
+		return -1
 	})
 	return args
 }

cmd/clusterctl/client/cluster/installer.go

@@ -19,7 +19,7 @@ package cluster
 import (
 	"context"
 	"fmt"
-	"sort"
+	"slices"
 	"strings"
 	"time"
 
@@ -90,8 +90,11 @@ func (i *providerInstaller) Add(components repository.Components) {
 	i.installQueue = append(i.installQueue, components)
 
 	// Ensure Providers are installed in the following order: Core, Bootstrap, ControlPlane, Infrastructure.
-	sort.Slice(i.installQueue, func(a, b int) bool {
-		return i.installQueue[a].Type().Order() < i.installQueue[b].Type().Order()
+	slices.SortFunc(i.installQueue, func(a, b repository.Components) int {
+		if a.Type().Order() < b.Type().Order() {
+			return -1
+		}
+		return 1
 	})
 }
 

cmd/clusterctl/client/cluster/objectgraph_test.go

@@ -19,7 +19,7 @@ package cluster
 import (
 	"context"
 	"fmt"
-	"sort"
+	"slices"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -2574,8 +2574,11 @@ func Test_objectGraph_setClusterTenants(t *testing.T) {
 			gb.setTenants()
 
 			gotClusters := gb.getClusters()
-			sort.Slice(gotClusters, func(i, j int) bool {
-				return gotClusters[i].identity.UID < gotClusters[j].identity.UID
+			slices.SortFunc(gotClusters, func(i, j *node) int {
+				if i.identity.UID < j.identity.UID {
+					return -1
+				}
+				return 1
 			})
 
 			g.Expect(gotClusters).To(HaveLen(len(tt.wantClusters)))
@@ -2673,8 +2676,11 @@ func Test_objectGraph_setCRSTenants(t *testing.T) {
 			gb.setTenants()
 
 			gotCRSs := gb.getCRSs()
-			sort.Slice(gotCRSs, func(i, j int) bool {
-				return gotCRSs[i].identity.UID < gotCRSs[j].identity.UID
+			slices.SortFunc(gotCRSs, func(i, j *node) int {
+				if i.identity.UID < j.identity.UID {
+					return -1
+				}
+				return 1
 			})
 
 			g.Expect(gotCRSs).To(HaveLen(len(tt.wantCRSs)))
@@ -2738,8 +2744,11 @@ func Test_objectGraph_setGlobalIdentityTenants(t *testing.T) {
 					gotIdentity = append(gotIdentity, n)
 				}
 			}
-			sort.Slice(gotIdentity, func(i, j int) bool {
-				return gotIdentity[i].identity.UID < gotIdentity[j].identity.UID
+			slices.SortFunc(gotIdentity, func(i, j *node) int {
+				if i.identity.UID < j.identity.UID {
+					return -1
+				}
+				return 1
 			})
 			g.Expect(gotIdentity).To(HaveLen(len(tt.wantIdentity)))
 

cmd/clusterctl/client/cluster/upgrader.go

@@ -18,7 +18,7 @@ package cluster
 
 import (
 	"context"
-	"sort"
+	"slices"
 	"strings"
 	"time"
 
@@ -398,8 +398,11 @@ func (u *providerUpgrader) doUpgrade(ctx context.Context, upgradePlan *UpgradePl
 
 	// Ensure Providers are updated in the following order: Core, Bootstrap, ControlPlane, Infrastructure.
 	providers := upgradePlan.Providers
-	sort.Slice(providers, func(a, b int) bool {
-		return providers[a].GetProviderType().Order() < providers[b].GetProviderType().Order()
+	slices.SortFunc(providers, func(a, b UpgradeItem) int {
+		if a.GetProviderType().Order() < b.GetProviderType().Order() {
+			return -1
+		}
+		return 1
 	})
 
 	if opts.EnableCRDStorageVersionMigration {

cmd/clusterctl/client/cluster/upgrader_info.go

@@ -19,7 +19,7 @@ package cluster
 import (
 	"context"
 	"fmt"
-	"sort"
+	"slices"
 
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -124,14 +124,19 @@ func (u *providerUpgrader) getUpgradeInfo(ctx context.Context, provider clusterc
 
 func newUpgradeInfo(metadata *clusterctlv1.Metadata, currentVersion *version.Version, nextVersions []version.Version) *upgradeInfo {
 	// Sorts release series; this ensures also an implicit ordering of contract versions.
-	sort.Slice(metadata.ReleaseSeries, func(i, j int) bool {
-		return metadata.ReleaseSeries[i].Major < metadata.ReleaseSeries[j].Major ||
-			(metadata.ReleaseSeries[i].Major == metadata.ReleaseSeries[j].Major && metadata.ReleaseSeries[i].Minor < metadata.ReleaseSeries[j].Minor)
+	slices.SortFunc(metadata.ReleaseSeries, func(i, j clusterctlv1.ReleaseSeries) int {
+		if i.Major < j.Major || (i.Major == j.Major && i.Minor < j.Minor) {
+			return -1
+		}
+		return 1
 	})
 
 	// Sorts nextVersions.
-	sort.Slice(nextVersions, func(i, j int) bool {
-		return nextVersions[i].LessThan(&nextVersions[j])
+	slices.SortFunc(nextVersions, func(i, j version.Version) int {
+		if i.LessThan(&j) {
+			return -1
+		}
+		return 1
 	})
 
 	// Gets the current contract for the provider

cmd/clusterctl/client/config/providers_client.go

@@ -19,7 +19,7 @@ package config
 import (
 	"net/url"
 	"os"
-	"sort"
+	"slices"
 	"strings"
 
 	"github.com/drone/envsubst/v2"
@@ -504,8 +504,11 @@ func (p *providersClient) List() ([]Provider, error) {
 	}
 
 	// ensure provider configurations are consistently sorted
-	sort.Slice(providers, func(i, j int) bool {
-		return providers[i].Less(providers[j])
+	slices.SortFunc(providers, func(i, j Provider) int {
+		if i.Less(j) {
+			return -1
+		}
+		return 1
 	})
 
 	return providers, nil

cmd/clusterctl/client/config/providers_client_test.go

@@ -18,7 +18,7 @@ package config
 
 import (
 	"fmt"
-	"sort"
+	"slices"
 	"testing"
 
 	. "github.com/onsi/gomega"
@@ -36,14 +36,20 @@ func Test_providers_List(t *testing.T) {
 	}
 
 	defaults := p.defaults()
-	sort.Slice(defaults, func(i, j int) bool {
-		return defaults[i].Less(defaults[j])
+	slices.SortFunc(defaults, func(i, j Provider) int {
+		if i.Less(j) {
+			return -1
+		}
+		return 1
 	})
 
 	defaultsAndZZZ := append(defaults, NewProvider("zzz", "https://zzz/infrastructure-components.yaml", "InfrastructureProvider"))
 	// AddonProviders are at the end of the list so we want to make sure this InfrastructureProvider is before the AddonProviders.
-	sort.Slice(defaultsAndZZZ, func(i, j int) bool {
-		return defaultsAndZZZ[i].Less(defaultsAndZZZ[j])
+	slices.SortFunc(defaultsAndZZZ, func(i, j Provider) int {
+		if i.Less(j) {
+			return -1
+		}
+		return 1
 	})
 
 	defaultsWithOverride := append([]Provider{}, defaults...)

cmd/clusterctl/client/repository/components.go

@@ -18,7 +18,7 @@ package repository
 
 import (
 	"fmt"
-	"sort"
+	"slices"
 	"strings"
 
 	"github.com/pkg/errors"
@@ -262,17 +262,20 @@ func NewComponents(input ComponentsInput) (Components, error) {
 	// Deploying cert-manager objects and especially Certificates before Mutating-
 	// ValidatingWebhookConfigurations and CRDs ensures cert-manager's ca-injector
 	// receives the event for the objects at the right time to inject the new CA.
-	sort.SliceStable(objs, func(i, j int) bool {
+	slices.SortStableFunc(objs, func(i, j unstructured.Unstructured) int {
 		// First prioritize Namespaces over everything.
-		if objs[i].GetKind() == "Namespace" {
-			return true
+		if i.GetKind() == "Namespace" {
+			return -1
 		}
-		if objs[j].GetKind() == "Namespace" {
-			return false
+		if j.GetKind() == "Namespace" {
+			return 1
 		}
 
 		// Second prioritize cert-manager objects.
-		return objs[i].GroupVersionKind().Group == "cert-manager.io"
+		if i.GroupVersionKind().Group == "cert-manager.io" {
+			return -1
+		}
+		return 1
 	})
 
 	return &components{

cmd/clusterctl/client/repository/repository_versions.go

@@ -18,7 +18,7 @@ package repository
 
 import (
 	"context"
-	"sort"
+	"slices"
 
 	"github.com/pkg/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -114,17 +114,20 @@ func latestPatchRelease(ctx context.Context, repo Repository, major, minor *int3
 	}
 
 	// Sort parsed versions by semantic version order.
-	sort.SliceStable(versionCandidates, func(i, j int) bool {
+	slices.SortStableFunc(versionCandidates, func(i, j *version.Version) int {
 		// Prioritize release versions over pre-releases. For example v1.0.0 > v2.0.0-alpha
 		// If both are pre-releases, sort by semantic version order as usual.
-		if versionCandidates[j].PreRelease() == "" && versionCandidates[i].PreRelease() != "" {
-			return false
+		if j.PreRelease() == "" && i.PreRelease() != "" {
+			return 1
 		}
-		if versionCandidates[i].PreRelease() == "" && versionCandidates[j].PreRelease() != "" {
-			return true
+		if i.PreRelease() == "" && j.PreRelease() != "" {
+			return -1
 		}
 
-		return versionCandidates[j].LessThan(versionCandidates[i])
+		if j.LessThan(i) {
+			return -1
+		}
+		return 1
 	})
 
 	// Limit the number of searchable versions by 5.

cmd/clusterctl/client/tree/tree.go

@@ -18,6 +18,7 @@ package tree
 
 import (
 	"fmt"
+	"slices"
 	"sort"
 	"strconv"
 	"strings"
@@ -149,8 +150,11 @@ func (od ObjectTree) Add(parent, obj client.Object, opts ...AddObjectOption) (ad
 
 		// The loop below will process the next node and decide if it belongs in a group. Since objects in the same group
 		// must have the same Kind, we sort by Kind so objects of the same Kind will be together in the list.
-		sort.Slice(siblings, func(i, j int) bool {
-			return siblings[i].GetObjectKind().GroupVersionKind().Kind < siblings[j].GetObjectKind().GroupVersionKind().Kind
+		slices.SortFunc(siblings, func(i, j client.Object) int {
+			if i.GetObjectKind().GroupVersionKind().Kind < j.GetObjectKind().GroupVersionKind().Kind {
+				return -1
+			}
+			return 1
 		})
 
 		for i := range siblings {

cmd/clusterctl/client/tree/util.go

@@ -18,7 +18,7 @@ package tree
 
 import (
 	"fmt"
-	"sort"
+	"slices"
 
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -116,8 +116,11 @@ func GetOtherV1Beta1Conditions(obj client.Object) []*clusterv1.Condition {
 			conditions = append(conditions, &c)
 		}
 	}
-	sort.Slice(conditions, func(i, j int) bool {
-		return conditions[i].Type < conditions[j].Type
+	slices.SortFunc(conditions, func(i, j *clusterv1.Condition) int {
+		if i.Type < j.Type {
+			return -1
+		}
+		return 1
 	})
 	return conditions
 }

cmd/clusterctl/client/upgrade_test.go

@@ -18,7 +18,7 @@ package client
 
 import (
 	"context"
-	"sort"
+	"slices"
 	"testing"
 
 	"github.com/google/go-cmp/cmp"
@@ -288,11 +288,17 @@ func Test_clusterctlClient_ApplyUpgrade(t *testing.T) {
 
 			g.Expect(c.List(ctx, gotProviders)).To(Succeed())
 
-			sort.Slice(gotProviders.Items, func(i, j int) bool {
-				return gotProviders.Items[i].Name < gotProviders.Items[j].Name
+			slices.SortFunc(gotProviders.Items, func(i, j clusterctlv1.Provider) int {
+				if i.Name < j.Name {
+					return -1
+				}
+				return 1
 			})
-			sort.Slice(tt.wantProviders.Items, func(i, j int) bool {
-				return tt.wantProviders.Items[i].Name < tt.wantProviders.Items[j].Name
+			slices.SortFunc(tt.wantProviders.Items, func(i, j clusterctlv1.Provider) int {
+				if i.Name < j.Name {
+					return -1
+				}
+				return 1
 			})
 			for i := range gotProviders.Items {
 				tt.wantProviders.Items[i].ResourceVersion = gotProviders.Items[i].ResourceVersion