Skip to content

Conversation

@sigma
Copy link
Contributor

@sigma sigma commented Nov 13, 2018

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

The inotify code was removed from golang.org/x/exp several years ago. Therefore
importing it from that path prevents downstream consumers from using any module
that makes use of more recent features of golang.org/x/exp.

This change is a followup to google/cadvisor#2060 which was merged with #70889

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):

Fixes #68478

Special notes for your reviewer:

Does this PR introduce a user-facing change?:

NONE

The inotify code was removed from golang.org/x/exp several years ago. Therefore
importing it from that path prevents downstream consumers from using any module
that makes use of more recent features of golang.org/x/exp.

This change is a followup to google/cadvisor#2060 which was merged with kubernetes#70889

This fixes kubernetes#68478
@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Nov 13, 2018
@k8s-ci-robot
Copy link
Contributor

Hi @sigma. Thanks for your PR.

I'm waiting for a kubernetes 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 area/kubelet sig/node Categorizes an issue or PR as relevant to SIG Node. and removed needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Nov 13, 2018
@sigma
Copy link
Contributor Author

sigma commented Nov 13, 2018

/assign @sttts @vishh @dims

@dims
Copy link
Member

dims commented Nov 13, 2018

/ok-to-test

we need this in 1.13 since cadvisor has already moved to it

/milestone v1.13

@k8s-ci-robot k8s-ci-robot added this to the v1.13 milestone Nov 13, 2018
@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 Nov 13, 2018
@mikedanese
Copy link
Member

If we are creating a fork just for k8s.io/kubernetes (e.g. nothing in staging/ needs it), we usually drop code in https://github.com/kubernetes/kubernetes/tree/master/third_party/forked

@dims
Copy link
Member

dims commented Nov 13, 2018

@mikedanese cadvisor needs it

@mikedanese
Copy link
Member

ok, thanks.

@sigma
Copy link
Contributor Author

sigma commented Nov 14, 2018

/retest

@dims
Copy link
Member

dims commented Nov 15, 2018

/priority important-soon

@k8s-ci-robot k8s-ci-robot added priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. and removed needs-priority Indicates a PR lacks a `priority/foo` label and requires one. labels Nov 15, 2018
@dims
Copy link
Member

dims commented Nov 15, 2018

/assign @sttts @vishh @cblecker

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 15, 2018
@vishh
Copy link
Contributor

vishh commented Nov 15, 2018

@dims we should prioritize switching to https://github.com/fsnotify/fsnotify in the next release given that the existing library is unmaintained (unless we (k8s community) take on ownership).
Would it make sense to create a third_party folder for cAdvisor as well instead of the current approach?

@dims
Copy link
Member

dims commented Nov 15, 2018

@vishh the last time we tried things broke - google/cadvisor#1807 someone has to go back and see if we can do something in fsnotify (or figure out if it has been fixed since)

@dims
Copy link
Member

dims commented Nov 15, 2018

@vishh am ok with adding a third_party/ in cadvisor repo if there is enough time ( cc @dashpole )

@dashpole
Copy link
Contributor

@dims I have bandwidth to review PRs and cut a new release

@sigma
Copy link
Contributor Author

sigma commented Nov 15, 2018

out of curiosity, what's the expected benefit of having that code in 2 third_party locations?
I'm still trying to figure out how we approach forking in general, it all feels very ad-hoc so far :)

@vishh
Copy link
Contributor

vishh commented Nov 15, 2018 via email

@cblecker
Copy link
Member

/approve
/hold

I'm good with this PR as is, but if we change direction to something in third_party, I'd like to re-review.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 15, 2018
@vishh
Copy link
Contributor

vishh commented Nov 16, 2018

@thockin are we ok with taking on third party forks of deleted official golang repositories as dependencies?

@nikopen
Copy link
Contributor

nikopen commented Nov 19, 2018

/kind bug
/priority critical-urgent

/cc @thockin

@k8s-ci-robot k8s-ci-robot requested a review from thockin November 19, 2018 15:04
@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. labels Nov 19, 2018
@AishSundar
Copy link
Contributor

@sigma @dims @vishh is this critical for 1.13? we are in code freeze and if possible, I would like to defer this until 1.14. let me know otherwise

/remove-priority critical-urgent

@k8s-ci-robot k8s-ci-robot removed the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Nov 19, 2018
@AishSundar
Copy link
Contributor

/remove-priority critical-urgent

@k8s-ci-robot
Copy link
Contributor

@AishSundar: Those labels are not set on the issue: priority/critical-urgent

In response to this:

/remove-priority critical-urgent

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.

@sigma
Copy link
Contributor Author

sigma commented Nov 19, 2018

@AishSundar personally I don't mind if it's pushed out. It should hopefully be a functionally neutral change, as the code in the old and new package is identical (it's slightly uglier not to merge it since said code is currently duplicated)

@nikopen
Copy link
Contributor

nikopen commented Nov 20, 2018

@dims what do you think about this one?

@dims
Copy link
Member

dims commented Nov 21, 2018

@nikopen i'd prefer that this gets in so k/k and cadvisor repos are in sync. (won't be terrible if it does not happen)

@AishSundar
Copy link
Contributor

Looks like this waiting on @thockin 's review

@thockin can you please take a look

@cblecker
Copy link
Member

I think we should just go ahead with this path as it's deduping to code that is already vendored. We can look in 1.14 if we want to move to fsnotify. At this point, this would just ensure that we don't have conflicting versions with cadvisor.

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 22, 2018
@nikopen
Copy link
Contributor

nikopen commented Nov 22, 2018

/priority critical-urgent

for merging

needs an approval

@k8s-ci-robot k8s-ci-robot added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Nov 22, 2018
@cblecker
Copy link
Member

Manually approving for the kubelet. We're only changing the package import path to use the existing vendored code, but at a different path.

@cblecker cblecker added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 23, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: cblecker, sigma

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 merged commit 12e5eb7 into kubernetes:master Nov 23, 2018
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. area/kubelet cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. sig/node Categorizes an issue or PR as relevant to SIG Node. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

gonum.org/v1/gonum module conflicts with use of golang.org/x/exp/inotify

10 participants