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

Add PodWrapper functions for scheduler testing #109536

Merged
merged 1 commit into from
May 4, 2022
Merged

Add PodWrapper functions for scheduler testing #109536

merged 1 commit into from
May 4, 2022

Conversation

yuanchen8911
Copy link
Member

@yuanchen8911 yuanchen8911 commented Apr 19, 2022 •
edited
Loading

What type of PR is this?

/kind feature

What this PR does / why we need it:

  1. Add additional PodWrapper functions to facilitate scheduler testing.
    1.1 Annotation(key, value string) adds a pair of (key, value) to pod.Annotations.
    1.2 CreationTimestamp(t metav1.Time) sets a pod's creationTimestamp.
    1.3 Condition(type v1.PodConditionType, status v1.ConditionStatus, reason string) adds a condition to pod.Status.Conditions.
  2. Replace ad-hoc pod building with PodWrapper.MakePod in pkg/scheduler/internal/queue/scheduler_queue_test.go.

Which issue(s) this PR fixes:

None

Special notes for your reviewer:

We should use PodWrapper.MakePod in other tests.

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Apr 19, 2022
@k8s-ci-robot
Copy link
Contributor

@yuanchen8911: This issue is currently awaiting triage.

If a SIG or subproject determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Apr 19, 2022
@k8s-ci-robot k8s-ci-robot added sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Apr 19, 2022
@yuanchen8911
Copy link
Member Author

sig/scheduling

@yuanchen8911
Copy link
Member Author

/cc @Huang-Wei

@yuanchen8911
Copy link
Member Author

/assign @Huang-Wei

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-verify

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-e2e-gce-ubuntu-containerd

denkensk
denkensk reviewed Apr 19, 2022
View reviewed changes
Copy link
Member

@denkensk denkensk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks.
Could you check the other files in pkg/scheduler and replace &v1.Pod{} with makePod if exists ?

pkg/scheduler/testing/wrappers.go Outdated Show resolved Hide resolved
@yuanchen8911
Copy link
Member Author

yuanchen8911 commented Apr 19, 2022 •
edited
Loading

Could you check the other files in pkg/scheduler and replace &v1.Pod{} with makePod if exists ?

A lot😄. Replacing all will require some efforts. Can it be a separate PR? I can move the changes to scheduler_queue_test.go from this PR to a second PR.

@yuanchen8911
Copy link
Member Author

Any idea why pull-kubernetes-verify failed?

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-verify

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-conformance-kind-ga-only-parallel —

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-verify

kerthcet
kerthcet reviewed Apr 20, 2022
View reviewed changes
pkg/scheduler/testing/wrappers.go Outdated
@@ -266,6 +281,12 @@ func (p *PodWrapper) NominatedNodeName(n string) *PodWrapper {
return p
}

// Condition adds a `conditon(Type, Status, Reason)` to .Status.Conditions.
Copy link
Member

@kerthcet kerthcet Apr 20, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

s/conditon/condition/, I think this is why your verify test failed.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you so much, @kerthcet!

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-e2e-kind-ipv6

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-e2e-kind

@yuanchen8911
Copy link
Member Author

/test pull-kubernetes-e2e-kind-ipv6

@Huang-Wei
Copy link
Member

/lgtm
/approve

Thanks @yuanchen8911 .

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 20, 2022
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Huang-Wei, yuanchen8911

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 20, 2022
@yibozhuang yibozhuang mentioned this pull request Apr 26, 2022
Merged
@k8s-ci-robot k8s-ci-robot merged commit aca3b6a into kubernetes:master May 4, 2022
@k8s-ci-robot k8s-ci-robot added this to the v1.25 milestone May 4, 2022
@novahe novahe mentioned this pull request May 5, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kerthcet kerthcet kerthcet left review comments

@chendave chendave Awaiting requested review from chendave

@Huang-Wei Huang-Wei Awaiting requested review from Huang-Wei

@denkensk denkensk Awaiting requested review from denkensk

Assignees

@Huang-Wei Huang-Wei

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/feature Categorizes issue or PR as related to a new feature. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. release-note-none Denotes a PR that doesn't merit a release note. sig/scheduling Categorizes an issue or PR as relevant to SIG Scheduling. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.25
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@yuanchen8911 @k8s-ci-robot @Huang-Wei @denkensk @kerthcet