github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #84191 from langyenan/getTypedVersion

Browse Source 
invoke getTypedVersion() instead of direct runtime call
This commit is contained in:
Kubernetes Prow Robot 2019-12-10 16:04:19 -08:00 committed by GitHub
commit 9ddbc90039
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kuberuntime/kuberuntime_manager.go
View File

@ -192,7 +192,7 @@ func NewKubeGenericRuntimeManager(
logReduction: logreduction.NewLogReduction(identicalErrorDelay), logReduction: logreduction.NewLogReduction(identicalErrorDelay),
} }
typedVersion, err := kubeRuntimeManager.runtimeService.Version(kubeRuntimeAPIVersion) typedVersion, err := kubeRuntimeManager.getTypedVersion()
if err != nil { if err != nil {
klog.Errorf("Get runtime version failed: %v", err) klog.Errorf("Get runtime version failed: %v", err)
return nil, err return nil, err
@ -268,17 +268,15 @@ func newRuntimeVersion(version string) (*utilversion.Version, error) {
func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) { func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) {
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion) typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion)
if err != nil { if err != nil {
klog.Errorf("Get remote runtime typed version failed: %v", err) return nil, fmt.Errorf("get remote runtime typed version failed: %v", err)
return nil, err
} }
return typedVersion, nil return typedVersion, nil
} }
// Version returns the version information of the container runtime. // Version returns the version information of the container runtime.
func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) { func (m *kubeGenericRuntimeManager) Version() (kubecontainer.Version, error) {
typedVersion, err := m.runtimeService.Version(kubeRuntimeAPIVersion) typedVersion, err := m.getTypedVersion()
if err != nil { if err != nil {
klog.Errorf("Get remote runtime version failed: %v", err)
return nil, err return nil, err
} }