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.

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

bugfix about update occupied in podGroup status #360

Merged
merged 1 commit into from
Mar 29, 2022

Conversation

NoicFank
Copy link
Contributor

@NoicFank NoicFank commented Mar 28, 2022

What type of PR is this?

/kind bug

What this PR does / why we need it:

currently, The updated information about occupied is edited locally rather than updated into apiserver. See the test TestFillGroupStatusOccupied for details.

Which issue(s) this PR fixes:

Fixes #
NONE

Special notes for your reviewer:

NONE

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 28, 2022
@k8s-ci-robot
Copy link
Contributor

Welcome @NoicFank!

It looks like this is your first PR to kubernetes-sigs/scheduler-plugins 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/scheduler-plugins has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

@k8s-ci-robot
Copy link
Contributor

Hi @NoicFank. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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 needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 28, 2022
@denkensk
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note-none Denotes a PR that doesn't merit a release note. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Mar 28, 2022
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 @NoicFank
Some comments for you.

if err != nil {
return false, err
}
if pg.Status.OccupiedBy != c.desiredGroupOccupied {
Copy link
Member

Choose a reason for hiding this comment

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

We can change desiredGroupOccupied to []string and compare them by cmp.Diff

Copy link
Contributor Author

Choose a reason for hiding this comment

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

the type of pg.Status.OccupiedBy is string, thus cmp.Diff works? as we change desiredGroupOccupied to []string .

Copy link
Member

Choose a reason for hiding this comment

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

O.. I forget the OccupiedBy is string....

Comment on lines 239 to 246
pg := makePG(c.pgName, c.minMember, c.groupPhase, nil)
pgClient := pgfake.NewSimpleClientset(pg)

informerFactory := informers.NewSharedInformerFactory(kubeClient, controller.NoResyncPeriodFunc())
pgInformerFactory := schedinformer.NewSharedInformerFactory(pgClient, controller.NoResyncPeriodFunc())
podInformer := informerFactory.Core().V1().Pods()
pgInformer := pgInformerFactory.Scheduling().V1alpha1().PodGroups()
ctrl := NewPodGroupController(kubeClient, pgInformer, podInformer, pgClient)
Copy link
Member

Choose a reason for hiding this comment

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

This part of the code has a lot of duplication with another test.
It's better to define a separate function for setup env for test.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

done. another one bug founded:
it should be desiredGroupPhase: v1alpha1.PodGroupPending in the case "Group min member more than Pod number" from test Test_Run.

Copy link
Contributor

Choose a reason for hiding this comment

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

It's better to define a separate function for setup env for test.

We can leave it to the kubebuilder migration. (@helayoty is working on using kubebuilder and envtest to migrate existing controller-related code).

Copy link
Member

@denkensk denkensk Mar 29, 2022

Choose a reason for hiding this comment

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

We can leave it to the kubebuilder migration.

Sure

Copy link
Contributor

Choose a reason for hiding this comment

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

tagging the kubebuilder issue here so I remember to handle that #327

pds := make([]*v1.Pod, 0)
for _, name := range podNames {
pod := st.MakePod().Namespace("default").Name(name).Obj()
pod.Labels = map[string]string{v1alpha1.PodGroupLabel: pgName}
pod.Status.Phase = phase
if reference != nil {
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
if reference != nil {
if reference != nil && len(reference) != 0 {

desiredGroupOccupied string
}{
{
name: "fill the desired Occupied",
Copy link
Member

Choose a reason for hiding this comment

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

fill the Occupied of PodGroup with a single ownerReference?

desiredGroupOccupied: "default/new-occupied",
},
{
name: "fill the desired Occupied, with multi ownerReference",
Copy link
Member

Choose a reason for hiding this comment

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

fill the Occupied of PodGroup with multi ownerReferences ?

@NoicFank NoicFank force-pushed the master branch 2 times, most recently from 63e008a to e1f6706 Compare March 28, 2022 12:40
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 28, 2022
@NoicFank
Copy link
Contributor Author

@denkensk thanks for reviews. its updated, PTAL.

@denkensk
Copy link
Member

/lgtm
/approve

Thanks. @NoicFank

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: denkensk, NoicFank

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 Mar 29, 2022
@k8s-ci-robot k8s-ci-robot merged commit 2fd5ce7 into kubernetes-sigs:master Mar 29, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
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/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants