Merge pull request kubernetes#17856 from rramkumar1/versions-util-refactor

Deprecate version util in pkg/k8sversion

Author: k8s-ci-robot

pkg/k8sversion/version.go

@@ -27,7 +27,6 @@ import (
 	kopsmodel "k8s.io/kops/pkg/apis/kops/model"
 	"k8s.io/kops/pkg/apis/kops/util"
 	"k8s.io/kops/pkg/assets"
-	"k8s.io/kops/pkg/k8sversion"
 	"k8s.io/kops/upup/pkg/fi"
 	"k8s.io/kops/util/pkg/vfs"
 
@@ -140,14 +139,14 @@ func Image(component string, clusterSpec *kops.ClusterSpec, assetsBuilder *asset
 		return "", fmt.Errorf("unable to parse assets as assetBuilder is not defined")
 	}
 
-	kubernetesVersion, err := k8sversion.Parse(clusterSpec.KubernetesVersion)
+	kubernetesVersion, err := kopsmodel.ParseKubernetesVersion(clusterSpec.KubernetesVersion)
 	if err != nil {
 		return "", err
 	}
 
 	imageName := component
 
-	if !kopsmodel.IsBaseURL(clusterSpec.KubernetesVersion) {
+	if !kubernetesVersion.IsBaseURL() {
 		image := "registry.k8s.io/" + imageName + ":" + "v" + kubernetesVersion.String()
 
 		return assetsBuilder.RemapImage(image), nil