Skip to content

Commit 9ddbc90

Browse files
authored
Merge pull request kubernetes#84191 from langyenan/getTypedVersion
invoke getTypedVersion() instead of direct runtime call
2 parents c0d5d11 + babdcd0 commit 9ddbc90

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
@@ -192,7 +192,7 @@ func NewKubeGenericRuntimeManager(
192192
logReduction: logreduction.NewLogReduction(identicalErrorDelay),
193193
}
194194

195-
typedVersion, err := kubeRuntimeManager.runtimeService.Version(kubeRuntimeAPIVersion)
195+
typedVersion, err := kubeRuntimeManager.getTypedVersion()
196196
if err != nil {
197197
klog.Errorf("Get runtime version failed: %v", err)
198198
return nil, err
@@ -268,17 +268,15 @@ func newRuntimeVersion(version string) (*utilversion.Version, error) {
268268
func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) {
269269
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion)
270270
if err != nil {
271-
klog.Errorf("Get remote runtime typed version failed: %v", err)
272-
return nil, err
271+
return nil, fmt.Errorf("get remote runtime typed version failed: %v", err)
273272
}
274273
return typedVersion, nil
275274
}
276275

277276
// Version returns the version information of the container runtime.
278277
func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) {
279-
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion)
278+
typedVersion, err := m.getTypedVersion()
280279
if err != nil {
281-
klog.Errorf("Get remote runtime version failed: %v", err)
282280
return nil, err
283281
}
284282

0 commit comments

Comments
 (0)