Skip to content
This repository was archived by the owner on Apr 17, 2025. It is now read-only.

Cherry pick of #283, #286, #294 #290

Merged

Conversation

keisukesakasai
Copy link

@keisukesakasai keisukesakasai commented May 30, 2023

Cherry pick of #283 , #286 , #294 on master.

#283: Show HierarchicalResourceQuota status by kubectl-hns
#286 : Remove unneeded dependency to k8s.io/kubernetes
#294: Remove unneeded replace clause from go.mod

The discussion regarding the content can be found here:
#284 (comment)

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels May 30, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @keisukesakasai. 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/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label May 30, 2023
@keisukesakasai
Copy link
Author

keisukesakasai commented May 31, 2023

Hi, @adrianludwin
Could you please check this PR, thanks.

/assign @adrianludwin

Copy link
Contributor

@adrianludwin adrianludwin left a comment

Choose a reason for hiding this comment

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

lgtm after one question about the go.mod changes

go.mod Outdated

require github.com/spf13/afero v1.6.0 // indirect

replace (
Copy link
Contributor

Choose a reason for hiding this comment

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

I didn't really question this last time - why is this here?

Copy link
Contributor

Choose a reason for hiding this comment

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

(The replace clause, just to clarify)

Copy link
Contributor

@mochizuki875 mochizuki875 Jun 5, 2023

Choose a reason for hiding this comment

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

Hi, @adrianludwin
In conclusion, the replace clause seems to be unnecessary.
It was added #283 as a workaround and has to be unneeded in #286.
(ref. kubernetes/kubernetes#79384)

Fundamentally this was my mistake... sorry.

So I removed it in #294 and please check it.

Copy link
Contributor

Choose a reason for hiding this comment

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

Thanks for fixing it, can you add #294 to this PR as well? Thanks!

Copy link
Author

Choose a reason for hiding this comment

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

I did it, please check. Thanks!

Copy link
Contributor

Choose a reason for hiding this comment

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

@keisukesakasai Thanks your add:)

@rjbez17
Copy link
Contributor

rjbez17 commented Jun 11, 2023

/ok-to-test
/lgtm

@adrianludwin can approve when ready

@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 Jun 11, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 11, 2023
@k8s-ci-robot k8s-ci-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 12, 2023
@keisukesakasai keisukesakasai changed the title Cherry pick of #283, #286 Cherry pick of #283, #286, #294 Jun 12, 2023
Copy link
Contributor

@adrianludwin adrianludwin left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

Thanks!

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adrianludwin, keisukesakasai

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 Jun 12, 2023
@k8s-ci-robot k8s-ci-robot merged commit ffd2763 into kubernetes-retired:v1.1 Jun 12, 2023
@adrianludwin adrianludwin added this to the release-v1.1 milestone Jun 12, 2023
@keisukesakasai keisukesakasai deleted the cherry-pick-of-#286-v1.1 branch June 17, 2023 02:20
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
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. 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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants