mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-13 19:36:22 +00:00
51a3d7b663
Automatic merge from submit-queue (batch tested with PRs 42369, 42375, 42397, 42435, 42455) Kubelet: return container runtime's version instead of CRI's one **What this PR does / why we need it**: With CRI enabled by default, kubelet reports the version of CRI instead of container runtime version. This PR fixes this problem. **Which issue this PR fixes** Fixes #42396. **Special notes for your reviewer**: Should also cherry-pick to 1.6 branch. **Release note**: ```release-note NONE ``` cc @yujuhong @kubernetes/sig-node-bugs