Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
May 15, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/actions/e2e/install-prometheus/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ prometheus:
resources:
requests:
cpu: 1
memory: 5Gi
jmdeal marked this conversation as resolved.
Show resolved Hide resolved
memory: 15Gi
limits:
cpu: 1
memory: 5Gi
memory: 15Gi
serviceMonitorSelector:
matchLabels:
scrape: enabled
Expand Down
4 changes: 2 additions & 2 deletions test/hack/e2e_scripts/install_karpenter.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
1 change: 1 addition & 0 deletions test/pkg/environment/common/setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ var (
&schedulingv1.PriorityClass{},
&v1.Node{},
&corev1beta1.NodeClaim{},
&v1beta1.EC2NodeClass{},
}
)

Expand Down
21 changes: 16 additions & 5 deletions test/suites/scale/deprovisioning_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand Down
Loading