Fixes from rebasing with upstream/main

kubernetes-sigs · Aug 7, 2024 · a762e48 · a762e48
1 parent f362a66
commit a762e48
Show file tree

Hide file tree

Showing 7 changed files with 68 additions and 231 deletions.
diff --git a/pkg/controllers/controllers.go b/pkg/controllers/controllers.go
@@ -92,7 +92,7 @@ func NewControllers(
 		nodeclaimlifecycle.NewController(clock, kubeClient, cloudProvider, recorder),
 		nodeclaimgarbagecollection.NewController(clock, kubeClient, cloudProvider),
 		nodeclaimtermination.NewController(kubeClient, cloudProvider, recorder),
-		nodeclaimdisruption.NewController(clock, kubeClient, cluster, cloudProvider),
+		nodeclaimdisruption.NewController(clock, kubeClient, cloudProvider),
 		orb.NewController(schedulingInputHeap, schedulingMetadataHeap),
 		leasegarbagecollection.NewController(kubeClient),
 		status.NewController[*v1.NodeClaim](kubeClient, mgr.GetEventRecorderFor("karpenter")),

diff --git a/pkg/controllers/orb/reconstruction.go b/pkg/controllers/orb/reconstruction.go