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

Non-admitted workloads with QuotaReserved condition are shown as Admitted by kubectl #1991

Merged

Conversation

vladikkuzn
Copy link
Contributor

@vladikkuzn vladikkuzn commented Apr 17, 2024

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

  • Renames "Admitted by" to "Reserving in" printed column of kubectl get workload
  • Adds "Admitted" printed column to kubectl get workload

Which issue(s) this PR fixes:

Fixes #1790

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Improve the kubectl output for workloads using admission checks.

@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. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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 Apr 17, 2024
@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 Apr 17, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @vladikkuzn. 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 the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Apr 17, 2024
Copy link

netlify bot commented Apr 17, 2024

Deploy Preview for kubernetes-sigs-kueue ready!

Name Link
🔨 Latest commit 49b10ae
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-sigs-kueue/deploys/6620e0f8193ef30008d97ad4
😎 Deploy Preview https://deploy-preview-1991--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.

@trasc
Copy link
Contributor

trasc commented Apr 17, 2024

/assign
/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 Apr 17, 2024
@vladikkuzn
Copy link
Contributor Author

That's how it looks:
image

And without wide option:
image

It's not possible to make it only True/False because it's a enum of 3 values: True/False/Unknown. Most projects output it that way

@vladikkuzn vladikkuzn marked this pull request as ready for review April 18, 2024 06: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 Apr 18, 2024
@vladikkuzn vladikkuzn force-pushed the update-output-of-k-get-workloads branch from b159904 to 9bd59b1 Compare April 18, 2024 06:09
Copy link
Contributor

@mimowo mimowo left a comment

Choose a reason for hiding this comment

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

Overall lgtm.

apis/kueue/v1beta1/workload_types.go Outdated Show resolved Hide resolved
apis/kueue/v1beta1/workload_types.go Outdated Show resolved Hide resolved
@mimowo
Copy link
Contributor

mimowo commented Apr 18, 2024

/release-note-edit Improve the kubectl output for workloads using admission checks

@mimowo
Copy link
Contributor

mimowo commented Apr 18, 2024

/release-note-edit```
Improve the kubectl output for workloads using admission checks

@mimowo
Copy link
Contributor

mimowo commented Apr 18, 2024

/release-note-edit ```
Improve the kubectl output for workloads using admission checks

@mimowo
Copy link
Contributor

mimowo commented Apr 18, 2024

Ok, not sure what I do wrong :) Please update the release note manually

@vladikkuzn
Copy link
Contributor Author

/release-note-edit

Improve the kubectl output for workloads using admission checks

@k8s-ci-robot
Copy link
Contributor

@vladikkuzn: You must be an org member to edit the release note.

In response to this:

/release-note-edit

Improve the kubectl output for workloads using admission checks

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.

@mimowo
Copy link
Contributor

mimowo commented Apr 18, 2024

Yay, this worked:
image

* Rename "Reserving in" to "Reserved in"
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 18, 2024
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Apr 18, 2024
@vladikkuzn
Copy link
Contributor Author

Made updates to the docs, thanks for notifying @tenzen-y

@alculquicondor
Copy link
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 Apr 18, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: c4884685884ab7ac35668a19ce6c528a610d8386

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: alculquicondor, vladikkuzn

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 18, 2024
@alculquicondor
Copy link
Contributor

/cherry-pick release-0.6

@k8s-infra-cherrypick-robot

@alculquicondor: once the present PR merges, I will cherry-pick it on top of release-0.6 in a new PR and assign it to you.

In response to this:

/cherry-pick release-0.6

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 merged commit e55bb8c into kubernetes-sigs:main Apr 18, 2024
15 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v0.7 milestone Apr 18, 2024
@k8s-infra-cherrypick-robot

@alculquicondor: #1991 failed to apply on top of branch "release-0.6":

Applying: * Rename "Admitted by" to "Reserving in" printed column * Add "Admitted" printed column
Applying: * Output Admitted column without -wide
Applying: * Remove priority=0 as it's default
Applying: * Documentation update * Rename "Reserving in" to "Reserved in"
Using index info to reconstruct a base tree...
M	apis/kueue/v1beta1/workload_types.go
M	charts/kueue/templates/crd/kueue.x-k8s.io_workloads.yaml
M	config/components/crd/bases/kueue.x-k8s.io_workloads.yaml
A	site/content/en/docs/tasks/run/jobs.md
A	site/content/en/docs/tasks/troubleshooting/troubleshooting_jobs.md
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): site/content/en/docs/tasks/troubleshooting/troubleshooting_jobs.md deleted in HEAD and modified in * Documentation update * Rename "Reserving in" to "Reserved in". Version * Documentation update * Rename "Reserving in" to "Reserved in" of site/content/en/docs/tasks/troubleshooting/troubleshooting_jobs.md left in tree.
Auto-merging site/content/en/docs/tasks/run_jobs.md
Auto-merging config/components/crd/bases/kueue.x-k8s.io_workloads.yaml
Auto-merging charts/kueue/templates/crd/kueue.x-k8s.io_workloads.yaml
Auto-merging apis/kueue/v1beta1/workload_types.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0004 * Documentation update * Rename "Reserving in" to "Reserved in"
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-0.6

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.

@vladikkuzn vladikkuzn deleted the update-output-of-k-get-workloads branch April 18, 2024 13:53
@alculquicondor
Copy link
Contributor

@tenzen-y what's your sentiment? should we attempt a manual cherry-pick?

@tenzen-y
Copy link
Member

@tenzen-y what's your sentiment? should we attempt a manual cherry-pick?

I think that cherry-picking would be worth it.
Actually, this is a bug since the Admitted status is shown based on the QuotaReserved without this commit.

@alculquicondor
Copy link
Contributor

@vladikkuzn could you produce a manual cherry-pick?
You can use ./hack/cherry_pick-pull.sh release-0.6 1991 to get started.

k8s-ci-robot pushed a commit that referenced this pull request Apr 19, 2024
…in" printed column * (#2014)

* * Rename "Admitted by" to "Reserving in" printed column * Add "Admitted" printed column

* * Output Admitted column without -wide

* * Remove priority=0 as it's default

* * Documentation update
* Rename "Reserving in" to "Reserved in"
@alculquicondor
Copy link
Contributor

/remove-kind cleanup
/kind feature

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. and removed kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels May 8, 2024
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/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. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

Non-admitted workloads with QuotaReserved condition are shown as Admitted by kubectl
7 participants