mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-30 13:48:50 +00:00
685fc92f65
Automatic merge from submit-queue Bump cadvisor dependencies to latest head. Fixes #28619 Fixes #28997 This is another try of https://github.com/kubernetes/kubernetes/pull/29153. To update cadvisor godeps, we did: * Bump up docker version to v1.11.2 for both cadvisor [https://github.com/google/cadvisor/pull/1388] and k8s. * Bump up cadvisor `go-systemd` version to be the same with k8s [https://github.com/google/cadvisor/pull/1390]. Or else, a package `github.com/coreos/pkg/dlopen` will be removed by Godep, because it is used by new `go-systemd` in k8s, but not used by old `go-systemd` in cadvisor. * Bump up runc version to be the same with docker v1.11.2 just in case. * Add `github.com/Azure/go-ansiterm` dependency which is needed by docker v1.11.2. * Change `pkg/util/term/`, because `SetWinsSize` is removed from windows platform in docker v1.11.2. [The first commit] @vishh /cc @ncdc for the `pkg/util/term` change.