diff --git a/test/e2e/placement_eviction_test.go b/test/e2e/placement_eviction_test.go index 725699557..87aa196e2 100644 --- a/test/e2e/placement_eviction_test.go +++ b/test/e2e/placement_eviction_test.go @@ -258,9 +258,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -330,9 +327,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -402,9 +396,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -474,9 +465,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -555,9 +543,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickAll C }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("add taint to member cluster 1", func() { @@ -658,9 +643,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -754,9 +736,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("add taint to member cluster 1", func() { @@ -870,9 +849,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -969,9 +945,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -1064,9 +1037,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -1160,9 +1130,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("add taint to member cluster 1", func() { @@ -1276,9 +1243,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { @@ -1375,9 +1339,6 @@ var _ = Describe("ClusterResourcePlacement eviction of bound binding - PickN CRP }, } Expect(hubClient.Create(ctx, &crpdb)).To(Succeed(), "Failed to create CRP Disruption Budget %s", crpName) - - ensureCRPDisruptionBudgetExists := ensureCRPDisruptionBudgetExists(crpName) - Eventually(ensureCRPDisruptionBudgetExists, eventuallyDuration, eventuallyInterval).Should(BeTrue(), "Failed to ensure CRP Disruption Budget exists") }) It("create cluster resource placement eviction targeting member cluster 1", func() { diff --git a/test/e2e/utils_test.go b/test/e2e/utils_test.go index b44da52e1..04f39cb92 100644 --- a/test/e2e/utils_test.go +++ b/test/e2e/utils_test.go @@ -928,17 +928,6 @@ func ensureCRPEvictionDeleted(crpEvictionName string) { Eventually(removedActual, eventuallyDuration, eventuallyInterval).Should(Succeed(), "CRP eviction still exists") } -func ensureCRPDisruptionBudgetExists(crpDisruptionBudgetName string) func() bool { - return func() bool { - crpdb := &placementv1beta1.ClusterResourcePlacementDisruptionBudget{ - ObjectMeta: metav1.ObjectMeta{ - Name: crpDisruptionBudgetName, - }, - } - return !k8serrors.IsNotFound(hubClient.Get(ctx, types.NamespacedName{Name: crpdb.Name}, crpdb)) - } -} - func ensureCRPDisruptionBudgetDeleted(crpDisruptionBudgetName string) { crpdb := &placementv1beta1.ClusterResourcePlacementDisruptionBudget{ ObjectMeta: metav1.ObjectMeta{