chore: remove v1alpha5 from disruption controller tests (kubernetes-s…

…igs#647)
sadath-12 · Nov 1, 2023 · c178881 · c178881
1 parent c3941b2
commit c178881
Show file tree

Hide file tree

Showing 9 changed files with 99 additions and 6,184 deletions.
diff --git a/...isruption/nodeclaim_consolidation_test.go → ...trollers/disruption/consolidation_test.go b/...isruption/nodeclaim_consolidation_test.go → ...trollers/disruption/consolidation_test.go
@@ -47,7 +47,7 @@ import (
 	. "github.com/aws/karpenter-core/pkg/test/expectations"
 )
 
-var _ = Describe("NodeClaim/Consolidation", func() {
+var _ = Describe("Consolidation", func() {
 	var nodePool *v1beta1.NodePool
 	var nodeClaim *v1beta1.NodeClaim
 	var node *v1.Node
@@ -652,7 +652,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], annotatedNode)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, annotatedNode}, []*v1beta1.NodeClaim{nodeClaim, annotatedNodeClaim})
 
 			fakeClock.Step(10 * time.Minute)
@@ -663,7 +663,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node and replace with a cheaper node
@@ -729,7 +729,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -740,7 +740,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node and replace with a cheaper node
@@ -806,7 +806,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -817,7 +817,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node and replace with a cheaper node
@@ -1389,7 +1389,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -1399,7 +1399,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node
@@ -1440,7 +1440,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -1450,7 +1450,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node
@@ -1491,7 +1491,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -1542,7 +1542,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -1552,7 +1552,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim)
 
 			// we should delete the non-annotated node
@@ -1955,7 +1955,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[1], node)
 			ExpectManualBinding(ctx, env.Client, pods[2], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -1965,7 +1965,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectReconcileSucceeded(ctx, disruptionController, client.ObjectKey{})
 			wg.Wait()
 
-			// Cascade any deletion of the machine to the node
+			// Cascade any deletion of the nodeClaim to the node
 			ExpectNodeClaimsCascadeDeletion(ctx, env.Client, nodeClaim2)
 
 			// we don't need a new node, but we should evict everything off one of node2 which only has a single pod
@@ -2275,7 +2275,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			// bind pods to node
 			ExpectManualBinding(ctx, env.Client, pod, node)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node}, []*v1beta1.NodeClaim{nodeClaim})
 
 			fakeClock.Step(10 * time.Minute)
@@ -2323,7 +2323,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			// bind pods to node
 			ExpectManualBinding(ctx, env.Client, pod, node)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node}, []*v1beta1.NodeClaim{nodeClaim})
 
 			fakeClock.Step(10 * time.Minute)
@@ -2371,7 +2371,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			// bind pods to node
 			ExpectManualBinding(ctx, env.Client, pod, node)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node}, []*v1beta1.NodeClaim{nodeClaim})
 
 			fakeClock.Step(10 * time.Minute)
@@ -2425,7 +2425,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[0], node)
 			ExpectManualBinding(ctx, env.Client, pods[1], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -2476,7 +2476,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[0], node)
 			ExpectManualBinding(ctx, env.Client, pods[1], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)
@@ -2527,7 +2527,7 @@ var _ = Describe("NodeClaim/Consolidation", func() {
 			ExpectManualBinding(ctx, env.Client, pods[0], node)
 			ExpectManualBinding(ctx, env.Client, pods[1], node2)
 
-			// inform cluster state about nodes and machines
+			// inform cluster state about nodes and nodeClaims
 			ExpectMakeNodesAndNodeClaimsInitializedAndStateUpdated(ctx, env.Client, nodeStateController, nodeClaimStateController, []*v1.Node{node, node2}, []*v1beta1.NodeClaim{nodeClaim, nodeClaim2})
 
 			fakeClock.Step(10 * time.Minute)

diff --git a/...ollers/disruption/nodeclaim_drift_test.go → pkg/controllers/disruption/drift_test.go b/...ollers/disruption/nodeclaim_drift_test.go → pkg/controllers/disruption/drift_test.go
@@ -38,7 +38,7 @@ import (
 	. "github.com/aws/karpenter-core/pkg/test/expectations"
 )
 
-var _ = Describe("NodeClaim/Drift", func() {
+var _ = Describe("Drift", func() {
 	var nodePool *v1beta1.NodePool
 	var nodeClaim *v1beta1.NodeClaim
 	var node *v1.Node

diff --git a/...rs/disruption/nodeclaim_emptiness_test.go → pkg/controllers/disruption/emptiness_test.go b/...rs/disruption/nodeclaim_emptiness_test.go → pkg/controllers/disruption/emptiness_test.go
@@ -33,7 +33,7 @@ import (
 	. "github.com/aws/karpenter-core/pkg/test/expectations"
 )
 
-var _ = Describe("NodeClaim/Emptiness", func() {
+var _ = Describe("Emptiness", func() {
 	var nodePool *v1beta1.NodePool
 	var nodeClaim *v1beta1.NodeClaim
 	var node *v1.Node

diff --git a/...s/disruption/nodeclaim_expiration_test.go → ...controllers/disruption/expiration_test.go b/...s/disruption/nodeclaim_expiration_test.go → ...controllers/disruption/expiration_test.go
@@ -38,7 +38,7 @@ import (
 	. "github.com/aws/karpenter-core/pkg/test/expectations"
 )
 
-var _ = Describe("NodeClaim/Expiration", func() {
+var _ = Describe("Expiration", func() {
 	var nodePool *v1beta1.NodePool
 	var nodeClaim *v1beta1.NodeClaim
 	var node *v1.Node