fix: Increase to large instance size for scale tests (#6184)

aws · May 15, 2024 · c93c945 · c93c945
1 parent 856ec3f
commit c93c945
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 9 deletions.
diff --git a/.github/actions/e2e/install-prometheus/values.yaml b/.github/actions/e2e/install-prometheus/values.yaml
@@ -47,10 +47,10 @@ prometheus:
     resources:
       requests:
         cpu: 1
-        memory: 5Gi
+        memory: 15Gi
       limits:
         cpu: 1
-        memory: 5Gi
+        memory: 15Gi
     serviceMonitorSelector:
       matchLabels:
         scrape: enabled

diff --git a/test/hack/e2e_scripts/install_karpenter.sh b/test/hack/e2e_scripts/install_karpenter.sh
@@ -26,9 +26,9 @@ helm upgrade --install karpenter "${CHART}" \
   --set settings.clusterName="$CLUSTER_NAME" \
   --set settings.interruptionQueue="$CLUSTER_NAME" \
   --set settings.featureGates.spotToSpotConsolidation=true \
-  --set controller.resources.requests.cpu=3 \
+  --set controller.resources.requests.cpu=5 \
   --set controller.resources.requests.memory=3Gi \
-  --set controller.resources.limits.cpu=3 \
+  --set controller.resources.limits.cpu=5 \
   --set controller.resources.limits.memory=3Gi \
   --set serviceMonitor.enabled=true \
   --set serviceMonitor.additionalLabels.scrape=enabled \

diff --git a/test/pkg/environment/common/setup.go b/test/pkg/environment/common/setup.go
@@ -58,6 +58,7 @@ var (
 		&schedulingv1.PriorityClass{},
 		&v1.Node{},
 		&corev1beta1.NodeClaim{},
+		&v1beta1.EC2NodeClass{},
 	}
 )
 

diff --git a/test/suites/scale/deprovisioning_test.go b/test/suites/scale/deprovisioning_test.go
@@ -85,11 +85,22 @@ var _ = Describe("Deprovisioning", Label(debug.NoWatch), Label(debug.NoEvents),
 		nodeClass = env.DefaultEC2NodeClass()
 		nodePool = env.DefaultNodePool(nodeClass)
 		nodePool.Spec.Limits = nil
-		test.ReplaceRequirements(nodePool, corev1beta1.NodeSelectorRequirementWithMinValues{
-			NodeSelectorRequirement: v1.NodeSelectorRequirement{Key: v1beta1.LabelInstanceHypervisor,
-				Operator: v1.NodeSelectorOpIn,
-				Values:   []string{"nitro"},
-			}})
+		test.ReplaceRequirements(nodePool, []corev1beta1.NodeSelectorRequirementWithMinValues{
+			{
+				NodeSelectorRequirement: v1.NodeSelectorRequirement{Key: v1beta1.LabelInstanceHypervisor,
+					Operator: v1.NodeSelectorOpIn,
+					Values:   []string{"nitro"},
+				},
+			},
+			// Ensure that all pods can fit on to the provisioned nodes including all daemonsets
+			{
+				NodeSelectorRequirement: v1.NodeSelectorRequirement{
+					Key:      v1beta1.LabelInstanceSize,
+					Operator: v1.NodeSelectorOpIn,
+					Values:   []string{"large"},
+				},
+			},
+		}...)
 		deploymentOptions = test.DeploymentOptions{
 			PodOptions: test.PodOptions{
 				ResourceRequirements: v1.ResourceRequirements{