cadvisor/runc updates

[sjenning]

Support CRI-O:
google/cadvisor#1741

Fix memory stats:
google/cadvisor#1728
opencontainers/runc#1378

@derekwaynecarr

[deads2k]

I thought you were planning to bump, not pick.

[sjenning]

@deads2k looked fairly impossible as a cadvisor bump would pull tons of new/renamed deps and cause conflicts.

google/cadvisor@92cca44
google/cadvisor@cfb16f1
google/cadvisor@8ba1845
google/cadvisor@20bd275
google/cadvisor@35de579

Turns out the functionality we were after could be obtained in a small number of picks.

[derekwaynecarr]

@sjenning - the picks are fine, we can bump to kube 1.8 release version of cAdvisor when that rebase happens as that had a lot of side-effects.

Can you see if we should take any of the following as well:

google/cadvisor#1706
google/cadvisor#1681
google/cadvisor#1679

Thanks!

[deads2k]

@sjenning - the picks are fine, we can bump to kube 1.8 release version of cAdvisor when that rebase happens as that had a lot of side-effects.

@sjenning since you're tried this, does this cause godep armageddon with the dockerregistry

[derekwaynecarr]

@deads2k - when doing this in kube 1.8, it caused issues with a name change of a dependency, see: kubernetes/kubernetes#51751 ; i will defer to seth on what he found in origin.

[deads2k]

@deads2k - when doing this in kube 1.8, it caused issues with a name change of a dependency, see: kubernetes/kubernetes#51751 ; i will defer to seth on what he found in origin.

Yeah, I'm going to assume that kube made it through, but if something like our dockerregistry requires conflicting levels it can severely hamper pulling that level into openshift. I'd like to get in front of openshift specific problems that are coming with a rebase.

[sjenning]

pulled in google/cadvisor#1706

google/cadvisor#1679 (google/cadvisor#1681 is just the 0.26 pick) already came in on the last kube bump

[derekwaynecarr]

/approve
/lgtm

[openshift-merge-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: derekwaynecarr, sjenning

The full list of commands accepted by this bot can be found here.

Details

Needs approval from an approver in each of these OWNERS Files:

• OWNERS [derekwaynecarr]

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

[openshift-merge-robot]

Automatic merge from submit-queue