From c1f572dc4ce8733390ff54aa280d3ad841db077d Mon Sep 17 00:00:00 2001 From: Karl Isenberg Date: Mon, 14 Feb 2022 22:48:45 -0800 Subject: [PATCH] chore: Remove redundant object sorting - The Solver Graph performs sorting. So the applier & destroyer don't need to. --- pkg/apply/applier.go | 3 --- pkg/apply/prune/prune.go | 3 --- 2 files changed, 6 deletions(-) diff --git a/pkg/apply/applier.go b/pkg/apply/applier.go index 3733c63..ddc54b3 100644 --- a/pkg/apply/applier.go +++ b/pkg/apply/applier.go @@ -6,7 +6,6 @@ package apply import ( "context" "fmt" - "sort" "time" "k8s.io/apimachinery/pkg/api/meta" @@ -28,7 +27,6 @@ import ( "sigs.k8s.io/cli-utils/pkg/inventory" "sigs.k8s.io/cli-utils/pkg/object" "sigs.k8s.io/cli-utils/pkg/object/validation" - "sigs.k8s.io/cli-utils/pkg/ordering" ) const defaultPollInterval = 2 * time.Second @@ -93,7 +91,6 @@ func (a *Applier) prepareObjects(localInv inventory.InventoryInfo, localObjs obj if err != nil { return nil, nil, err } - sort.Sort(ordering.SortableUnstructureds(localObjs)) return localObjs, pruneObjs, nil } diff --git a/pkg/apply/prune/prune.go b/pkg/apply/prune/prune.go index 6c540a8..6d51df8 100644 --- a/pkg/apply/prune/prune.go +++ b/pkg/apply/prune/prune.go @@ -13,7 +13,6 @@ package prune import ( "context" - "sort" apierrors "k8s.io/apimachinery/pkg/api/errors" "k8s.io/apimachinery/pkg/api/meta" @@ -27,7 +26,6 @@ import ( "sigs.k8s.io/cli-utils/pkg/common" "sigs.k8s.io/cli-utils/pkg/inventory" "sigs.k8s.io/cli-utils/pkg/object" - "sigs.k8s.io/cli-utils/pkg/ordering" ) // Pruner implements GetPruneObjs to calculate which objects to prune and Prune @@ -233,7 +231,6 @@ func (p *Pruner) GetPruneObjs( } objs = append(objs, pruneObj) } - sort.Sort(sort.Reverse(ordering.SortableUnstructureds(objs))) return objs, nil }