Skip to content

K
k3s
Commit 51a3d7b6 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #42397 from feiskyer/fix-42396

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
parents 6675dada 1986b78e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View file @ 51a3d7b6
...@@ -225,7 +225,7 @@ func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) { ...@@ -225,7 +225,7 @@ func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) {
return nil, err return nil, err
} }
return newRuntimeVersion(typedVersion.Version) return newRuntimeVersion(typedVersion.RuntimeVersion)
} }
// APIVersion returns the cached API version information of the container // APIVersion returns the cached API version information of the container
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment