From 6a573470327bdfa338d28f98c8c39c746776813e Mon Sep 17 00:00:00 2001 From: jeevanpuchakay Date: Fri, 13 Sep 2024 22:18:47 +0530 Subject: [PATCH] Use ExpectSingletonReconciled from operatorpkg --- .../disruption/consolidation_test.go | 208 +++++++++--------- 1 file changed, 105 insertions(+), 103 deletions(-) diff --git a/pkg/controllers/disruption/consolidation_test.go b/pkg/controllers/disruption/consolidation_test.go index e67813657..fd7925860 100644 --- a/pkg/controllers/disruption/consolidation_test.go +++ b/pkg/controllers/disruption/consolidation_test.go @@ -25,6 +25,8 @@ import ( "sync/atomic" "time" + "sigs.k8s.io/karpenter/pkg/metrics" + . "github.com/onsi/ginkgo/v2" . "github.com/onsi/gomega" "github.com/samber/lo" @@ -42,11 +44,11 @@ import ( "sigs.k8s.io/karpenter/pkg/controllers/disruption" pscheduling "sigs.k8s.io/karpenter/pkg/controllers/provisioning/scheduling" "sigs.k8s.io/karpenter/pkg/events" - "sigs.k8s.io/karpenter/pkg/metrics" "sigs.k8s.io/karpenter/pkg/operator/options" "sigs.k8s.io/karpenter/pkg/scheduling" "sigs.k8s.io/karpenter/pkg/test" . "sigs.k8s.io/karpenter/pkg/test/expectations" + expectations "github.com/awslabs/operatorpkg/test/expectations" ) var _ = Describe("Consolidation", func() { @@ -109,7 +111,7 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() Expect(recorder.Calls("Unconsolidatable")).To(Equal(0)) @@ -122,7 +124,7 @@ var _ = Describe("Consolidation", func() { ExpectManualBinding(ctx, env.Client, pod, node) ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{node}, []*v1.NodeClaim{nodeClaim}) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) Expect(recorder.Calls("Unconsolidatable")).To(Equal(4)) }) It("should fire an event for ConsolidationDisabled when the NodePool has consolidateAfter set to 'Never'", func() { @@ -132,7 +134,7 @@ var _ = Describe("Consolidation", func() { ExpectManualBinding(ctx, env.Client, pod, node) ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{node}, []*v1.NodeClaim{nodeClaim}) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // We get six calls here because we have Nodes and NodeClaims that fired for this event // and each of the consolidation mechanisms specifies that this event should be fired Expect(recorder.Calls("Unconsolidatable")).To(Equal(6)) @@ -154,7 +156,7 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{node}, []*v1.NodeClaim{nodeClaim}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) ExpectMetricGaugeValue(disruption.EligibleNodes, 0, map[string]string{ metrics.ReasonLabel: "underutilized", }) @@ -167,7 +169,7 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) wg := sync.WaitGroup{} ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() ExpectMetricGaugeValue(disruption.EligibleNodes, 1, map[string]string{ @@ -217,7 +219,7 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() metric, found := FindMetricWithLabelValues("karpenter_nodepools_allowed_disruptions", map[string]string{ @@ -227,7 +229,7 @@ var _ = Describe("Consolidation", func() { Expect(metric.GetGauge().GetValue()).To(BeNumerically("==", 3)) // Execute command, thus deleting 3 nodes - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(7)) }) It("should allow all empty nodes to be disrupted", func() { @@ -243,7 +245,7 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() metric, found := FindMetricWithLabelValues("karpenter_nodepools_allowed_disruptions", map[string]string{ @@ -253,7 +255,7 @@ var _ = Describe("Consolidation", func() { Expect(metric.GetGauge().GetValue()).To(BeNumerically("==", 10)) // Execute command, thus deleting all nodes - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(0)) }) It("should allow no empty nodes to be disrupted", func() { @@ -265,7 +267,7 @@ var _ = Describe("Consolidation", func() { } // inform cluster state about nodes and nodeclaims ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, nodes, nodeClaims) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) metric, found := FindMetricWithLabelValues("karpenter_nodepools_allowed_disruptions", map[string]string{ "nodepool": nodePool.Name, }) @@ -273,7 +275,7 @@ var _ = Describe("Consolidation", func() { Expect(metric.GetGauge().GetValue()).To(BeNumerically("==", 0)) // Execute command, thus deleting all nodes - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(numNodes)) Expect(numNodes).To(Equal(numNodes)) }) @@ -315,11 +317,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Execute command, thus deleting 3 nodes - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(7)) }) It("should only allow 3 nodes to be deleted in single node consolidation delete", func() { @@ -362,13 +364,13 @@ var _ = Describe("Consolidation", func() { ExpectToWait(&wg) // Reconcile 5 times, enqueuing 3 commands total. for i := 0; i < 5; i++ { - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) } wg.Wait() // Execute all commands in the queue, only deleting 3 nodes for i := 0; i < 5; i++ { - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) } Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(7)) }) @@ -424,7 +426,7 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() for _, np := range nps { @@ -436,7 +438,7 @@ var _ = Describe("Consolidation", func() { } // Execute the command in the queue, only deleting 20 node claims - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(10)) }) It("should allow all nodes from each nodePool to be deleted", func() { @@ -490,7 +492,7 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() for _, np := range nps { @@ -502,7 +504,7 @@ var _ = Describe("Consolidation", func() { } // Execute the command in the queue, deleting all node claims - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(0)) }) It("should allow no nodes from each nodePool to be deleted", func() { @@ -553,7 +555,7 @@ var _ = Describe("Consolidation", func() { // inform cluster state about nodes and nodeclaims ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, nodes, nodeClaims) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) for _, np := range nps { metric, found := FindMetricWithLabelValues("karpenter_nodepools_allowed_disruptions", map[string]string{ "nodepool": np.Name, @@ -563,7 +565,7 @@ var _ = Describe("Consolidation", func() { } // Execute the command in the queue, deleting all node claims - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) Expect(len(ExpectNodeClaims(ctx, env.Client))).To(Equal(30)) }) It("should not mark empty node consolidated if the candidates can't be disrupted due to budgets with one nodepool", func() { @@ -864,11 +866,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -953,8 +955,8 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) // consolidation won't delete the old nodeclaim until the new nodeclaim is ready - ExpectSingletonReconciled(ctx, disruptionController) - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, queue) // shouldn't delete the node Expect(ExpectNodes(ctx, env.Client)).To(HaveLen(1)) @@ -996,8 +998,8 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) // consolidation won't delete the old nodeclaim until the new nodeclaim is ready - ExpectSingletonReconciled(ctx, disruptionController) - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, queue) // shouldn't delete the node Expect(ExpectNodes(ctx, env.Client)).To(HaveLen(1)) @@ -1071,7 +1073,7 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) // consolidation won't delete the old nodeclaim until the new nodeclaim is ready - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // we didn't create a new nodeclaim or delete the old one Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -1160,11 +1162,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, spotNodeClaim) @@ -1285,11 +1287,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, spotNodeClaim) @@ -1410,11 +1412,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, spotNodeClaim) @@ -1529,7 +1531,7 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) // consolidation won't delete the old nodeclaim until the new nodeclaim is ready - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // we didn't create a new nodeclaim or delete the old one Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -1578,11 +1580,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -1650,7 +1652,7 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // we didn't create a new nodeclaim or delete the old one Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -1730,11 +1732,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -1804,11 +1806,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -1899,10 +1901,10 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeClaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -1990,10 +1992,10 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim) @@ -2082,7 +2084,7 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{node}, []*v1.NodeClaim{nodeClaim}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // Expect to not create or delete more nodeclaims Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -2183,7 +2185,7 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{node}, []*v1.NodeClaim{nodeClaim}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // Expect to not create or delete more nodeclaims Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -2247,11 +2249,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -2294,11 +2296,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -2348,11 +2350,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2410,11 +2412,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2462,10 +2464,10 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeClaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2510,10 +2512,10 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2561,8 +2563,8 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{nodes[0], nodes[1]}, []*v1.NodeClaim{nodeClaims[0], nodeClaims[1]}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2610,8 +2612,8 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{nodes[0], nodes[1]}, []*v1.NodeClaim{nodeClaims[0], nodeClaims[1]}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -2656,11 +2658,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -2700,8 +2702,8 @@ var _ = Describe("Consolidation", func() { ExpectReconcileSucceeded(ctx, nodeClaimStateController, client.ObjectKeyFromObject(nodeClaims[0])) ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{nodes[1]}, []*v1.NodeClaim{nodeClaims[1]}) - ExpectSingletonReconciled(ctx, disruptionController) - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, queue) // shouldn't delete the node Expect(ExpectNodes(ctx, env.Client)).To(HaveLen(2)) @@ -2846,11 +2848,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) ExpectNodeClaimsCascadeDeletion(ctx, env.Client, consolidatableNodeClaim) // Expect no events that state that the pods would schedule against a uninitialized node @@ -2902,11 +2904,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -2958,7 +2960,7 @@ var _ = Describe("Consolidation", func() { fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // No node can be deleted as it would cause one of the three pods to go pending Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(2)) @@ -3012,11 +3014,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -3110,7 +3112,7 @@ var _ = Describe("Consolidation", func() { go func() { defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the controller to block on the validation timeout @@ -3129,7 +3131,7 @@ var _ = Describe("Consolidation", func() { wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -3177,7 +3179,7 @@ var _ = Describe("Consolidation", func() { defer GinkgoRecover() defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the disruptionController to block on the validation timeout @@ -3241,7 +3243,7 @@ var _ = Describe("Consolidation", func() { defer GinkgoRecover() defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the disruptionController to block on the validation timeout @@ -3261,7 +3263,7 @@ var _ = Describe("Consolidation", func() { Eventually(finished.Load, 10*time.Second).Should(BeTrue()) wg.Wait() - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // nothing should be removed since the node is no longer empty Expect(ExpectNodeClaims(ctx, env.Client)).To(HaveLen(1)) @@ -3286,7 +3288,7 @@ var _ = Describe("Consolidation", func() { wg.Add(1) go func() { defer wg.Done() - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // Iterate in a loop until we get to the validation action @@ -3330,7 +3332,7 @@ var _ = Describe("Consolidation", func() { wg.Add(1) go func() { defer wg.Done() - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // Iterate in a loop until we get to the validation action @@ -3377,7 +3379,7 @@ var _ = Describe("Consolidation", func() { wg.Add(1) go func() { defer wg.Done() - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // Iterate in a loop until we get to the validation action @@ -3424,7 +3426,7 @@ var _ = Describe("Consolidation", func() { wg.Add(1) go func() { defer wg.Done() - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // Iterate in a loop until we get to the validation action @@ -3536,11 +3538,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0], nodeClaims[1], nodeClaims[2]) @@ -3600,11 +3602,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0], nodeClaims[1], nodeClaims[2]) @@ -3672,11 +3674,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -3736,7 +3738,7 @@ var _ = Describe("Consolidation", func() { defer GinkgoRecover() defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the controller to block on the validation timeout @@ -3755,7 +3757,7 @@ var _ = Describe("Consolidation", func() { wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0], nodeClaims[1]) @@ -3799,7 +3801,7 @@ var _ = Describe("Consolidation", func() { defer GinkgoRecover() defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the controller to block on the validation timeout @@ -3831,7 +3833,7 @@ var _ = Describe("Consolidation", func() { wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0], nodeClaims[1], nodeClaims[2]) @@ -3882,7 +3884,7 @@ var _ = Describe("Consolidation", func() { defer GinkgoRecover() defer wg.Done() defer finished.Store(true) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() // wait for the controller to block on the validation timeout @@ -3926,7 +3928,7 @@ var _ = Describe("Consolidation", func() { wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0], nodeClaims[1], nodeClaims[2]) @@ -4006,11 +4008,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[0]) @@ -4119,11 +4121,11 @@ var _ = Describe("Consolidation", func() { var wg sync.WaitGroup ExpectToWait(&wg) ExpectMakeNewNodeClaimsReady(ctx, env.Client, &wg, cluster, cloudProvider, 1) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) wg.Wait() // Process the item so that the nodes can be deleted. - ExpectSingletonReconciled(ctx, queue) + expectations.ExpectSingletonReconciled(ctx, queue) // Cascade any deletion of the nodeclaim to the node ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaims[1]) @@ -4200,7 +4202,7 @@ var _ = Describe("Consolidation", func() { ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*corev1.Node{nodes[0], nodes[1], nodes[2]}, []*v1.NodeClaim{nodeClaims[0], nodeClaims[1], nodeClaims[2]}) fakeClock.Step(10 * time.Minute) - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) // our nodes are already the cheapest available, so we can't replace them. If we delete, it would // violate the anti-affinity rule, so we can't do anything. @@ -4252,7 +4254,7 @@ var _ = Describe("Consolidation", func() { ExpectToWait(&wg) go func() { defer GinkgoRecover() - ExpectSingletonReconciled(ctx, disruptionController) + expectations.ExpectSingletonReconciled(ctx, disruptionController) }() wg.Wait()