Skip to content

Add more clarify on how reclaimWithinCohort interacts with fair sharing#3287

Merged
k8s-ci-robot merged 6 commits into
kubernetes-sigs:mainfrom
avrittrohwer:main
Oct 23, 2024
Merged

Add more clarify on how reclaimWithinCohort interacts with fair sharing#3287
k8s-ci-robot merged 6 commits into
kubernetes-sigs:mainfrom
avrittrohwer:main

Conversation

@avrittrohwer

Copy link
Copy Markdown

What type of PR is this?

/kind documentation

What this PR does / why we need it:

  1. Clarifies API docs for reclaimWithinCohort 'if the pending Workload fits within the nominal quota' wording.
  2. Makes it more obvious in concept docs that fair sharing works in addition to the preemption policies set.

Which issue(s) this PR fixes:

Fixes #3286

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. kind/documentation Categorizes issue or PR as related to documentation. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 22, 2024
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Welcome @avrittrohwer!

It looks like this is your first PR to kubernetes-sigs/kueue 🎉. 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/kueue 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 k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Oct 22, 2024
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

Hi @avrittrohwer. 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.

Details

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-sigs/prow repository.

@k8s-ci-robot k8s-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 22, 2024
@netlify

netlify Bot commented Oct 22, 2024

Copy link
Copy Markdown

Deploy Preview for kubernetes-sigs-kueue ready!

Name Link
🔨 Latest commit d7cb3f2
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/67183efd4ee5340008c25c07
😎 Deploy Preview https://deploy-preview-3287--kubernetes-sigs-kueue.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site configuration.

Comment thread site/content/en/docs/reference/kueue.v1beta1.md
@alculquicondor

Copy link
Copy Markdown
Contributor

/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. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Oct 22, 2024
Comment thread site/content/en/docs/reference/kueue.v1beta1.md Outdated
Comment thread site/content/en/docs/concepts/preemption.md Outdated
Avritt Rohwer and others added 2 commits October 22, 2024 20:10
Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>
@k8s-ci-robot k8s-ci-robot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 22, 2024
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Oct 22, 2024
@avrittrohwer avrittrohwer marked this pull request as ready for review October 22, 2024 21:06
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 22, 2024
@mimowo

mimowo commented Oct 23, 2024

Copy link
Copy Markdown
Contributor

Thanks!
/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 23, 2024
@k8s-ci-robot

Copy link
Copy Markdown
Contributor

LGTM label has been added.

DetailsGit tree hash: 086360139f6d83a4b8844e178561f49bc249d8a8

@k8s-ci-robot

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: avrittrohwer, mimowo

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

The pull request process is described here

Details 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 Oct 23, 2024
@k8s-ci-robot k8s-ci-robot merged commit 46c64cc into kubernetes-sigs:main Oct 23, 2024
@k8s-ci-robot k8s-ci-robot added this to the v0.9 milestone Oct 23, 2024
@mimowo

mimowo commented Oct 23, 2024

Copy link
Copy Markdown
Contributor

/cherry-pick website
As it might be useful for some users before 0.9 is released.

@k8s-infra-cherrypick-robot

Copy link
Copy Markdown
Contributor

@mimowo: #3287 failed to apply on top of branch "website":

Applying: Add more clarify on how reclaimWithinCohort interacts with fair sharing
Applying: replace running with admitted
Applying: Update site/content/en/docs/reference/kueue.v1beta1.md
Applying: Update comments in clusterqueue_types.go, regenerate docs
Using index info to reconstruct a base tree...
M	apis/kueue/v1beta1/clusterqueue_types.go
M	charts/kueue/templates/crd/kueue.x-k8s.io_clusterqueues.yaml
M	config/components/crd/bases/kueue.x-k8s.io_clusterqueues.yaml
M	site/content/en/docs/reference/kueue.v1beta1.md
Falling back to patching base and 3-way merge...
Auto-merging site/content/en/docs/reference/kueue.v1beta1.md
CONFLICT (content): Merge conflict in site/content/en/docs/reference/kueue.v1beta1.md
Auto-merging config/components/crd/bases/kueue.x-k8s.io_clusterqueues.yaml
Auto-merging charts/kueue/templates/crd/kueue.x-k8s.io_clusterqueues.yaml
Auto-merging apis/kueue/v1beta1/clusterqueue_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0004 Update comments in clusterqueue_types.go, regenerate docs

Details

In response to this:

/cherry-pick website
As it might be useful for some users before 0.9 is released.

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-sigs/prow repository.

@mimowo

mimowo commented Oct 23, 2024

Copy link
Copy Markdown
Contributor

@avrittrohwer could you check if the conflicts are easily fixable, if so, then feel free to create the cherry-pick manually. You can use the script: ./hack/cherry_pick_pull.sh for that.

avrittrohwer pushed a commit to avrittrohwer/kueue that referenced this pull request Oct 23, 2024
…ng (kubernetes-sigs#3287)

* Add more clarify on how reclaimWithinCohort interacts with fair sharing

* replace running with admitted

* Update site/content/en/docs/reference/kueue.v1beta1.md

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>

* Update comments in clusterqueue_types.go, regenerate docs

* Add fair sharing goal, regenerate

* clarify language

---------

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>
@avrittrohwer

Copy link
Copy Markdown
Author

@avrittrohwer could you check if the conflicts are easily fixable, if so, then feel free to create the cherry-pick manually. You can use the script: ./hack/cherry_pick_pull.sh for that.

#3294

k8s-ci-robot pushed a commit that referenced this pull request Oct 23, 2024
…ng (#3287) (#3294)

* Add more clarify on how reclaimWithinCohort interacts with fair sharing

* replace running with admitted

* Update site/content/en/docs/reference/kueue.v1beta1.md



* Update comments in clusterqueue_types.go, regenerate docs

* Add fair sharing goal, regenerate

* clarify language

---------

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>
PBundyra pushed a commit to PBundyra/kueue that referenced this pull request Nov 5, 2024
…ng (kubernetes-sigs#3287)

* Add more clarify on how reclaimWithinCohort interacts with fair sharing

* replace running with admitted

* Update site/content/en/docs/reference/kueue.v1beta1.md

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>

* Update comments in clusterqueue_types.go, regenerate docs

* Add fair sharing goal, regenerate

* clarify language

---------

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>
kannon92 pushed a commit to openshift-kannon92/kubernetes-sigs-kueue that referenced this pull request Nov 19, 2024
…ng (kubernetes-sigs#3287)

* Add more clarify on how reclaimWithinCohort interacts with fair sharing

* replace running with admitted

* Update site/content/en/docs/reference/kueue.v1beta1.md

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>

* Update comments in clusterqueue_types.go, regenerate docs

* Add fair sharing goal, regenerate

* clarify language

---------

Co-authored-by: Aldo Culquicondor <1299064+alculquicondor@users.noreply.github.com>
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/documentation Categorizes issue or PR as related to documentation. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Document how preemption fields interact with fair sharing strategies

6 participants