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

reintroduce resourcequota.NewMonitor #120777

Merged

Conversation

atiratree
Copy link
Member

@atiratree atiratree commented Sep 20, 2023

What type of PR is this?

/kind bug

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

After bumping kubernetes dependencies, other projects depending on this public constructor will fail to compile. E.g. openshift/cluster-policy-controller#132. Since the QuotaMonitor members are private, there is no workaround.

Special notes for your reviewer:

This PR should be backported to 1.28 for compatibility reasons.

Does this PR introduce a user-facing change?

NONE

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


- this function is used by other packages and  was mistakenly removed
  in 397cc73
- let resource quota controller use this constructor instead of an
  object instantiation
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/bug Categorizes issue or PR as related to a bug. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. kind/regression Categorizes issue or PR as related to a regression from a prior release. 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. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 20, 2023
@k8s-ci-robot k8s-ci-robot added sig/apps Categorizes an issue or PR as relevant to SIG Apps. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 20, 2023
@HirazawaUi
Copy link
Contributor

Thanks, but as #115103 (comment) , we do not guarantee compatibility of internal packages!

Perhaps we can also look at @thockin's thoughts on the issue.

@soltysh
Copy link
Contributor

soltysh commented Sep 20, 2023

Thanks, but as #115103 (comment) , we do not guarantee compatibility of internal packages!

It's not as easy as the issue claims, and there will be cases where we'll continue keeping those functions as is.

Copy link
Contributor

@soltysh soltysh 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

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

LGTM label has been added.

Git tree hash: e3f9cf7e529c2046a4da8eb10626ed27c30111d3

@soltysh
Copy link
Contributor

soltysh commented Sep 20, 2023

/triage accepted
/priority important-longterm

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Sep 20, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atiratree, soltysh

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-none Denotes a PR that doesn't merit a release note. labels Sep 20, 2023
@pacoxu
Copy link
Member

pacoxu commented Sep 21, 2023

/retest

@pacoxu
Copy link
Member

pacoxu commented Sep 21, 2023

/test pull-kubernetes-node-e2e-containerd

@k8s-ci-robot k8s-ci-robot merged commit bf421d5 into kubernetes:master Sep 21, 2023
14 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.29 milestone Sep 21, 2023
@pacoxu
Copy link
Member

pacoxu commented Sep 21, 2023

This PR should be backported to 1.28 for compatibility reasons.

@atiratree Do you have time to create the cherry-pick PR to v1.28 for this regression?

@atiratree
Copy link
Member Author

@pacoxu yes, I have just opened the cherry-pick: #120795

k8s-ci-robot added a commit that referenced this pull request Sep 21, 2023
…20777-upstream-release-1.28

Automated cherry pick of #120777: reintroduce resourcequota.NewMonitor
@liggitt liggitt removed the kind/regression Categorizes issue or PR as related to a regression from a prior release. label Sep 27, 2023
@liggitt
Copy link
Member

liggitt commented Sep 27, 2023

FWIW, this was not a regression. Stability of go functions / signatures in k8s.io/kubernetes aren't part of the API surface area we guarantee.

@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Sep 27, 2023
@thockin
Copy link
Member

thockin commented Sep 27, 2023

Agree emphatically - we do not support people importing from within k8s.io/kubernetes and any project that depends on it may find themselves on the receiving end of such a cleanup.

@atiratree
Copy link
Member Author

ack, thanks for removing the regression part

dhellmann added a commit to dhellmann/microshift that referenced this pull request Oct 6, 2023
dhellmann added a commit to dhellmann/microshift that referenced this pull request Oct 10, 2023
openshift-ci bot pushed a commit to openshift/microshift that referenced this pull request Oct 13, 2023
* update last_rebase.sh

* update changelog

* update microshift/go.mod

* update microshift/vendor

* update etcd/go.mod

* update etcd/vendor

* update component images

* update manifests

* update buildfiles

* add patch to reintroduce resourcequota.NewMonitor

See kubernetes/kubernetes#120777

* apply resourcequota.NewMonitor patch

* update location of ServiceIPRange

The definition of ServiceIPRange changed in upstream kubernetes, so
update the way we import it.

* remove trailing whitespace in build_images.sh

* USHIFT-1638: fix current release package source template

At the start of a release cycle there are no EC or RC builds for the
current release, so we should skip adding the package source. Package
sources are skipped if their template produces an empty file when
rendered. The crel template was producing a file with 1 blank
line. Fix the whitespace marker at the end of the template to avoid an
extra blank line.

* USHIFT-1638: fix detection of empty blueprint file

Use the right local variable for the file to check for content to
detect that a template for a blueprint rendered empty.

* when crd manager receives cancel notice return the error

* USHIFT-1638: allow repeated configuration of logging

Tell the logging code that it's OK to receive reconfiguration
instructions unless those instructions are different. This overrides
the default behavior of erroring out if any instructions are received
a second time. That default behavior causes issues with embedded
components that all use the same logging code and are not expecting to
be compiled together into the same process, as they are in
MicroShift. See comments in
k8s.io/component-base/logs/api/v1/options.go for details.

---------

Co-authored-by: ci-robot <[email protected]>
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. priority/important-longterm Important over the long term, but may not be staffed and/or may need multiple releases to complete. release-note-none Denotes a PR that doesn't merit a release note. sig/apps Categorizes an issue or PR as relevant to SIG Apps. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants