Skip to content

AUTOSCALE-681: various karpenter and karpenterupgrade test fixes #8510

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

Open
maxcao13 wants to merge 3 commits into
base: main
Choose a base branch
from
+13 −8
Open

AUTOSCALE-681: various karpenter and karpenterupgrade test fixes #8510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ce5ca9
fix(e2e): scope waitForReadyKarpenterPods to workload labels
maxcao13 May 13, 2026
9c23f06
fix(e2e): 4.22 version gate for TestKarpenterUpgradeControlPlane
maxcao13 May 13, 2026
9b68e6a
fix(e2e): use arm-based pod image in karpenter arm test
maxcao13 May 13, 2026
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
6 changes: 3 additions & 3 deletions test/e2e/karpenter_control_plane_upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
)

func TestKarpenterUpgradeControlPlane(t *testing.T) {
e2eutil.AtLeast(t, e2eutil.Version422)
e2eutil.ShouldRunKarpenterTests(t)
if globalOpts.Platform != hyperv1.AWSPlatform {
t.Skip("test only supported on platform AWS")
}
Expand Down Expand Up @@ -70,7 +70,7 @@ func TestKarpenterUpgradeControlPlane(t *testing.T) {

nodes := e2eutil.WaitForReadyNodesByLabels(t, ctx, guestClient, hostedCluster.Spec.Platform.Type, int32(replicas), nodeLabels)
nodeClaims := waitForReadyNodeClaims(t, ctx, guestClient, len(nodes))
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, replicas)
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, replicas, map[string]string{"app": "web-app"})

preUpgradeOSImage := nodes[0].Status.NodeInfo.OSImage
t.Logf("Pre-upgrade node: %s, OS image: %s", nodes[0].Name, preUpgradeOSImage)
Expand Down Expand Up @@ -127,7 +127,7 @@ func TestKarpenterUpgradeControlPlane(t *testing.T) {
)

t.Logf("Waiting for Karpenter pods to schedule on the new node")
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, replicas)
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, replicas, map[string]string{"app": "web-app"})

nodeClaims = waitForReadyNodeClaims(t, ctx, guestClient, len(nodes))

Expand Down
15 changes: 10 additions & 5 deletions test/e2e/karpenter_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,8 @@ func testARM64Provisioning(ctx context.Context, guestClient crclient.Client, hos
{Key: "kubernetes.io/arch", Operator: corev1.NodeSelectorOpIn, Values: []string{"arm64"}},
{Key: karpenterv1.CapacityTypeLabelKey, Operator: corev1.NodeSelectorOpIn, Values: []string{karpenterv1.CapacityTypeOnDemand}},
}
armWorkLoads := testWorkload("arm-app", 1, map[string]string{karpenterv1.NodePoolLabelKey: armNodePool.Name})
// quay.io/openshift/origin-pod does not support arm64
armWorkLoads := testWorkloadWithImage("arm-app", 1, map[string]string{karpenterv1.NodePoolLabelKey: armNodePool.Name}, "quay.io/hypershift/sleep:multiarch")

Comment thread
coderabbitai[bot] marked this conversation as resolved.
t.Cleanup(func() {
_ = guestClient.Delete(ctx, armWorkLoads)
Expand All @@ -334,7 +335,7 @@ func testARM64Provisioning(ctx context.Context, guestClient crclient.Client, hos
}

nodes := e2eutil.WaitForReadyNodesByLabels(t, ctx, guestClient, hostedCluster.Spec.Platform.Type, 1, armNodeLabels)
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, 1)
waitForReadyKarpenterPods(t, ctx, guestClient, nodes, 1, map[string]string{"app": "arm-app"})

g.Expect(guestClient.Delete(ctx, armNodePool)).To(Succeed())
t.Logf("Deleted ARM64 NodePool")
Expand Down Expand Up @@ -1514,12 +1515,12 @@ func testBillingConsolidationAndPDB(ctx context.Context, mgtClient, guestClient
}
}

func waitForReadyKarpenterPods(t *testing.T, ctx context.Context, client crclient.Client, nodes []corev1.Node, n int) []corev1.Pod {
func waitForReadyKarpenterPods(t *testing.T, ctx context.Context, client crclient.Client, nodes []corev1.Node, n int, podLabels map[string]string) []corev1.Pod {
pods := &corev1.PodList{}
waitTimeout := 20 * time.Minute
e2eutil.EventuallyObjects(t, ctx, "Pods to be scheduled on provisioned Karpenter nodes",
func(ctx context.Context) ([]*corev1.Pod, error) {
err := client.List(ctx, pods, crclient.InNamespace("default"))
err := client.List(ctx, pods, crclient.InNamespace("default"), crclient.MatchingLabels(podLabels))
items := make([]*corev1.Pod, len(pods.Items))
for i := range pods.Items {
items[i] = &pods.Items[i]
Expand Down Expand Up @@ -1760,6 +1761,10 @@ func baseNodePool(name, nodeClassName string) *karpenterv1.NodePool {
}

func testWorkload(name string, replicas int32, nodeSelector map[string]string) *appsv1.Deployment {
return testWorkloadWithImage(name, replicas, nodeSelector, "quay.io/openshift/origin-pod:4.22.0")
}

func testWorkloadWithImage(name string, replicas int32, nodeSelector map[string]string, image string) *appsv1.Deployment {
appLabel := map[string]string{"app": name}
return &appsv1.Deployment{
ObjectMeta: metav1.ObjectMeta{
Expand Down Expand Up @@ -1787,7 +1792,7 @@ func testWorkload(name string, replicas int32, nodeSelector map[string]string) *
},
Containers: []corev1.Container{{
Name: name,
Image: "quay.io/openshift/origin-pod:4.22.0",
Image: image,
Resources: corev1.ResourceRequirements{
Requests: corev1.ResourceList{
corev1.ResourceCPU: resource.MustParse("250m"),
Expand Down