Skip to content

Conversation

@wking
Copy link
Contributor

@wking wking commented May 11, 2018

Generated by running vndr as installed from LK4D4/vndr@1fc68ee0 (preserve directories with .c files, 2018-04-30).

Spot checking one of the changes, the -io/+syscall import change in github.com/containerd/cgroups/blkio.go is unwinding containerd/cgroups@77e62851 (Use /proc/diskstats to get device names, 2018-01-31), because our vendor.conf has pinned containerd/cgroups@7a5fdd83 (Merge pull request #26 from onorua/error-ignore-example, 2017-08-24) since af64e10 (Vendor in lots of kubernetes stuff to shrink image size, 2018-03-26, #554). It looks like ae89dc2 (Update containerd/cgroups repo fix perf issue, 2018-02-01, #284) updated the vendored file without updating vendor.conf.

We'll probably want to go through and update vendor.conf until a fresh vndr run doesn't change vendor, and I've marked this PR as a WIP until I get to that point.

@wking
Copy link
Contributor Author

wking commented May 11, 2018

Actually af64e10 (#554) didn't change the pinned containerd/cgroups@7a5fdd8, it just reordered the file and confused blame. We've pinned that version since forking from CRI-O.

@mheon
Copy link
Member

mheon commented May 11, 2018

@wking For containerd/cgroups and most of our other pinned libraries - we're mostly pinning specific commits not because we require specific functionality or want to depend on a specific version of a library, but to try and make sure we don't bump vendored libraries except deliberately by updating the pinned commit (and potentially break things in the process). So feel free to update pinned commits as necessary.

Generated by running 'vndr' as installed from LK4D4/vndr@1fc68ee0
(preserve directories with .c files, 2018-04-30).  The changes being
pulled in seem to be due to vendor/ bumps that neglected the
associated vendor.conf bump.  I'll keep the WIP subject prefix until
we resolve enough of the vendor.conf issues to make the full re-vendor
acceptable.

Signed-off-by: W. Trevor King <[email protected]>
@wking
Copy link
Contributor Author

wking commented May 11, 2018

Rebased onto master with a8eb55e -> 3fe410d now that #749 through #752 have landed. We've shrunk the change size a bit (but more insertions, maybe in vendor/golang.org/x/crypto, for some reason?).
But we still have a ways to go:

$ git --no-pager show --oneline --shortstat a8eb55e
a8eb55e WIP: vendor: Update with a fresh vndr run
 153 files changed, 4725 insertions(+), 13414 deletions(-)
$ git --no-pager show --oneline --shortstat 3fe410d 
3fe410d (HEAD -> vndr-cleanup) WIP: vendor: Update with a fresh vndr run
 144 files changed, 8280 insertions(+), 3503 deletions(-)

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably 9153640) made this pull request unmergeable. Please resolve the merge conflicts.

@rh-atomic-bot
Copy link
Collaborator

☔ The latest upstream changes (presumably #859) made this pull request unmergeable. Please resolve the merge conflicts.

@rhatdan
Copy link
Member

rhatdan commented Jul 13, 2018

Needs to be redone.

@baude
Copy link
Member

baude commented Oct 27, 2018

No action in a long time, closing. Reopen if needed

@baude baude closed this Oct 27, 2018
@github-actions github-actions bot added the locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments. label Sep 27, 2023
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Sep 27, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

locked - please file new issue/PR Assist humans wanting to comment on an old issue or PR with locked comments.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants