Merge pull request #16441 from sjenning/pick-kubelet-crio

Automatic merge from submit-queue (batch tested with PRs 13840, 16033, 16322, 16441) Pick kubelet CRI-O enhancements kubernetes/kubernetes#51728 kubernetes/kubernetes#52073 kubernetes/kubernetes#52297 @derekwaynecarr @mrunalp https://trello.com/c/9nhJ7wcK
openshift · Sep 21, 2017 · d1888de · d1888de
2 parents 7b36998 + 34e0a3c
commit d1888de
Show file tree

Hide file tree

Showing 9 changed files with 129 additions and 34 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go b/vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_unsupported.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_unsupported.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_windows.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_windows.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_linux.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_linux.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_unsupported.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_unsupported.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/types.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/types.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e_node/environment/conformance.go b/vendor/k8s.io/kubernetes/test/e2e_node/environment/conformance.go