Skip to content

fix(e2e-next): normalize pod-level status.Resources in pod sync status assertions #4012

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
sowmyav27 wants to merge 1 commit into
base: v0.34
Choose a base branch
from
+6 −0
Open

fix(e2e-next): normalize pod-level status.Resources in pod sync status assertions #4012

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
6 changes: 6 additions & 0 deletions e2e-next/test_core/sync/test_pods.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,9 @@ func PodSyncSpec() {
// Since k8s 1.32, status.QOSClass field has become immutable,
// hence we have stopped syncing it.
pod.Status.QOSClass = vpod.Status.QOSClass
// k8s 1.35 tenant can't carry pod-level Resources/AllocatedResources; exclude them from the comparison.
vpod.Status.Resources, pod.Status.Resources = nil, nil
vpod.Status.AllocatedResources, pod.Status.AllocatedResources = nil, nil
Expect(vpod.Status).To(Equal(pod.Status))
})

Expand Down Expand Up @@ -272,6 +275,9 @@ func PodSyncSpec() {
pod, err := hostClient.CoreV1().Pods(hostNS).Get(ctx, pPodName, metav1.GetOptions{})
Expect(err).To(Succeed())
pod.Status.QOSClass = vpod.Status.QOSClass
// k8s 1.35 tenant can't carry pod-level Resources/AllocatedResources; exclude them from the comparison.
vpod.Status.Resources, pod.Status.Resources = nil, nil
vpod.Status.AllocatedResources, pod.Status.AllocatedResources = nil, nil
Expect(vpod.Status).To(Equal(pod.Status))
})

Expand Down
Loading