Merge pull request #122636 from lianghao208/pod_condition

kube-scheduler: fix empty lastTransitionTime in pod condition
This commit is contained in:
Kubernetes Prow Robot 2024-06-18 10:39:35 -07:00 committed by GitHub
commit b616d91675
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions

View File

@ -754,7 +754,7 @@ func applySchedulingGatedCondition(pod *api.Pod) {
}
}
pod.Status.Conditions = append(pod.Status.Conditions, api.PodCondition{
podutil.UpdatePodCondition(&pod.Status, &api.PodCondition{
Type: api.PodScheduled,
Status: api.ConditionFalse,
Reason: apiv1.PodReasonSchedulingGated,

View File

@ -353,7 +353,10 @@ func TestSchedulingGatedCondition(t *testing.T) {
}
}
if diff := cmp.Diff(tt.want, got); diff != "" {
if got.LastTransitionTime.IsZero() && got.Type != "" {
t.Errorf("unexpected empty LastTransitionTime in condition")
}
if diff := cmp.Diff(tt.want, got, cmpopts.IgnoreFields(api.PodCondition{}, "LastTransitionTime")); diff != "" {
t.Errorf("unexpected field errors (-want, +got):\n%s", diff)
}
})