Merge branch 'main' into main

aws · Nov 20, 2024 · 8eaf92a · 8eaf92a
2 parents 284f43e + bbb4996
commit 8eaf92a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/pkg/cloudprovider/cloudprovider.go b/pkg/cloudprovider/cloudprovider.go
@@ -254,16 +254,6 @@ func (c *CloudProvider) RepairPolicies() []cloudprovider.RepairPolicy {
 			ConditionStatus:    corev1.ConditionFalse,
 			TolerationDuration: 30 * time.Minute,
 		},
-		{
-			ConditionType:      corev1.NodeDiskPressure,
-			ConditionStatus:    corev1.ConditionTrue,
-			TolerationDuration: 30 * time.Minute,
-		},
-		{
-			ConditionType:      corev1.NodeMemoryPressure,
-			ConditionStatus:    corev1.ConditionTrue,
-			TolerationDuration: 30 * time.Minute,
-		},
 	}
 }
 

diff --git a/test/suites/integration/repair_policy_test.go b/test/suites/integration/repair_policy_test.go
@@ -78,16 +78,6 @@ var _ = Describe("Repair Policy", func() {
 			Status:             corev1.ConditionFalse,
 			LastTransitionTime: metav1.Time{Time: time.Now().Add(-31 * time.Minute)},
 		}),
-		Entry("DiskPressure", corev1.NodeCondition{
-			Type:               corev1.NodeDiskPressure,
-			Status:             corev1.ConditionTrue,
-			LastTransitionTime: metav1.Time{Time: time.Now().Add(-31 * time.Minute)},
-		}),
-		Entry("MemoryPressure", corev1.NodeCondition{
-			Type:               corev1.NodeMemoryPressure,
-			Status:             corev1.ConditionTrue,
-			LastTransitionTime: metav1.Time{Time: time.Now().Add(-31 * time.Minute)},
-		}),
 	)
 	It("should ignore disruption budgets", func() {
 		nodePool.Spec.Disruption.Budgets = []karpenterv1.Budget{