rancher/rke
1
0
Fork 0
mirror of https://github.com/rancher/rke.git synced 2025-08-21 00:03:49 +00:00
Code Issues Releases Wiki Activity

Handle non-semver k8s images

Browse Source
This commit is contained in:
moelsayed 2018-04-18 08:52:55 +02:00 committed by Darren Shepherd
parent 9ab1035852
commit a8b0cf052d
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/plan.go
View File

@ -615,10 +615,11 @@ func (c *Cluster) getPrefixPath(osType string) string {
func (c *Cluster) GetKubernetesServicesOptions() v3.KubernetesServicesOptions { func (c *Cluster) GetKubernetesServicesOptions() v3.KubernetesServicesOptions {
clusterMajorVersion := getTagMajorVersion(c.Version) clusterMajorVersion := getTagMajorVersion(c.Version)
NamedkK8sImage, _ := ref.ParseNormalizedNamed(c.SystemImages.Kubernetes) NamedkK8sImage, _ := ref.ParseNormalizedNamed(c.SystemImages.Kubernetes)
k8sImageTag := NamedkK8sImage.(ref.Tagged).Tag() k8sImageTag := NamedkK8sImage.(ref.Tagged).Tag()
k8sImageMajorVersion := getTagMajorVersion(k8sImageTag) k8sImageMajorVersion := getTagMajorVersion(k8sImageTag)
if clusterMajorVersion != k8sImageMajorVersion { if clusterMajorVersion != k8sImageMajorVersion && k8sImageMajorVersion != "" {
clusterMajorVersion = k8sImageMajorVersion clusterMajorVersion = k8sImageMajorVersion
} }
@ -631,5 +632,8 @@ func (c *Cluster) GetKubernetesServicesOptions() v3.KubernetesServicesOptions {
func getTagMajorVersion(tag string) string { func getTagMajorVersion(tag string) string {
splitTag := strings.Split(tag, ".") splitTag := strings.Split(tag, ".")
if len(splitTag) < 2 {
return ""
}
return strings.Join(splitTag[:2], ".") return strings.Join(splitTag[:2], ".")
} }