github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 12:43:23 +00:00
Code Issues Projects Releases Wiki Activity

kubelet falls back to parse generic version string if not semver

Browse Source
This commit is contained in:
Di Xu 2017-10-17 14:31:18 +08:00
parent 1ab5075c7c
commit 8f61376d05
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -212,7 +212,10 @@ func (m *kubeGenericRuntimeManager) Type() string {
} }
func newRuntimeVersion(version string) (*utilversion.Version, error) { func newRuntimeVersion(version string) (*utilversion.Version, error) {
return utilversion.ParseSemantic(version) if ver, err := utilversion.ParseSemantic(version); err == nil {
return ver, err
}
return utilversion.ParseGeneric(version)
} }
func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) { func (m *kubeGenericRuntimeManager) getTypedVersion() (*runtimeapi.VersionResponse, error) {