Commit d1888de
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/9nhJ7wcKFile tree
9 files changed
+129
-34
lines changed- vendor/k8s.io/kubernetes
- cmd/kubelet/app
- pkg/kubelet/cadvisor
- test/e2e_node/environment
9 files changed
+129
-34
lines changedSome generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 9 additions & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 5 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 53 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 34 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
0 commit comments