github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #130563 from bitoku/automated-cherry-pick-of-#130097-upstream-release-1.32

Browse Source 
Automated cherry pick of #130097: Modify how to check the status in PodRejectionStatus test
This commit is contained in:
Kubernetes Prow Robot 2025-03-06 04:04:03 -08:00 committed by GitHub
commit d2dbce82b9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
test/e2e/node/pod_admission.go
View File

@ -21,6 +21,7 @@ import (
"github.com/onsi/ginkgo/v2"
"github.com/onsi/gomega"
"github.com/onsi/gomega/gstruct"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@ -97,14 +98,24 @@ var _ = SIGDescribe("PodRejectionStatus", func() {
// This detects if there are any new fields in Status that were dropped by the pod rejection.
// These new fields either should be kept by kubelet's admission or added explicitly in the list of fields that are having a different value or must be cleared.
expectedStatus := pod.Status.DeepCopy()
expectedStatus.Phase = gotPod.Status.Phase
expectedStatus.Conditions = nil
expectedStatus.Message = gotPod.Status.Message
expectedStatus.Reason = gotPod.Status.Reason
expectedStatus.StartTime = gotPod.Status.StartTime
// expectedStatus.QOSClass keep it as is
gomega.Expect(gotPod.Status).To(gomega.Equal(*expectedStatus))
gomega.Expect(gotPod.Status).To(gstruct.MatchAllFields(gstruct.Fields{
"Phase": gstruct.Ignore(),
"Conditions": gstruct.Ignore(),
"Message": gstruct.Ignore(),
"Reason": gstruct.Ignore(),
"NominatedNodeName": gstruct.Ignore(),
"HostIP": gstruct.Ignore(),
"HostIPs": gstruct.Ignore(),
"PodIP": gstruct.Ignore(),
"PodIPs": gstruct.Ignore(),
"StartTime": gstruct.Ignore(),
"InitContainerStatuses": gstruct.Ignore(),
"ContainerStatuses": gstruct.Ignore(),
"QOSClass": gomega.Equal(pod.Status.QOSClass), // QOSClass should be kept
"EphemeralContainerStatuses": gstruct.Ignore(),
"Resize": gstruct.Ignore(),
"ResourceClaimStatuses": gstruct.Ignore(),
}))
})
})
})