Merge pull request #54040 from dixudx/fix_kubelet_runtime_version_parsing

Automatic merge from submit-queue (batch tested with PRs 54040, 52503). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. falls back to parse Docker runtime version as generic if not semver **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #54039 **Special notes for your reviewer**: /assign @tallclair @vishh **Release note**: ```release-note falls back to parse Docker runtime version as generic if not semver ```

Merge pull request #54040 from dixudx/fix_kubelet_runtime_version_parsing
86f7e270 · Kubernetes Submit Queue · GitHub · 4b0511dc · 8f61376d · 86f7e270
Commit 86f7e270 authored Oct 17, 2017 by Kubernetes Submit Queue Committed by GitHub Oct 17, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

kuberuntime_manager.go pkg/kubelet/kuberuntime/kuberuntime_manager.go +4 -1

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -212,7 +212,10 @@ func (m *kubeGenericRuntimeManager) Type() string {
 }
 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) {