Skip to content

Commit d1888de

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents 7b36998 + 34e0a3c commit d1888de

File tree

9 files changed

+129
-34
lines changed

9 files changed

+129
-34
lines changed

‎vendor/k8s.io/kubernetes/cmd/kubelet/app/server.go

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/BUILD

+13-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_linux.go

+9-17
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_unsupported.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/cadvisor_windows.go

+5-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_linux.go

+53
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/helpers_unsupported.go

+34
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/kubelet/cadvisor/types.go

+7-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/test/e2e_node/environment/conformance.go

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)