Skip to content

Commit babdcd0

Browse files
committed
invoke getTypedVersion() instead of direct runtime call
1 parent c981bce commit babdcd0

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

pkg/kubelet/kuberuntime/kuberuntime_manager.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ func NewKubeGenericRuntimeManager(
188188
logReduction: logreduction.NewLogReduction(identicalErrorDelay),
189189
}
190190

191-
typedVersion, err := kubeRuntimeManager.runtimeService.Version(kubeRuntimeAPIVersion)
191+
typedVersion, err := kubeRuntimeManager.getTypedVersion()
192192
if err != nil {
193193
klog.Errorf("Get runtime version failed: %v", err)
194194
return nil, err
@@ -253,17 +253,15 @@ func newRuntimeVersion(version string) (*utilversion.Version, error) {
253253
func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) {
254254
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion)
255255
if err != nil {
256-
klog.Errorf("Get remote runtime typed version failed: %v", err)
257-
return nil, err
256+
return nil, fmt.Errorf("get remote runtime typed version failed: %v", err)
258257
}
259258
return typedVersion, nil
260259
}
261260

262261
// Version returns the version information of the container runtime.
263262
func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) {
264-
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion)
263+
typedVersion, err := m.getTypedVersion()
265264
if err != nil {
266-
klog.Errorf("Get remote runtime version failed: %v", err)
267265
return nil, err
268266
}
269267

0 commit comments

Comments
 (0)