From a8b0cf052d1cfdb5c4002a00bd7d0e2ea16f1bb8 Mon Sep 17 00:00:00 2001 From: moelsayed Date: Wed, 18 Apr 2018 08:52:55 +0200 Subject: [PATCH] Handle non-semver k8s images --- cluster/plan.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/cluster/plan.go b/cluster/plan.go index 80437168..88fc23e7 100644 --- a/cluster/plan.go +++ b/cluster/plan.go @@ -615,10 +615,11 @@ func (c *Cluster) getPrefixPath(osType string) string { func (c *Cluster) GetKubernetesServicesOptions() v3.KubernetesServicesOptions { clusterMajorVersion := getTagMajorVersion(c.Version) NamedkK8sImage, _ := ref.ParseNormalizedNamed(c.SystemImages.Kubernetes) + k8sImageTag := NamedkK8sImage.(ref.Tagged).Tag() k8sImageMajorVersion := getTagMajorVersion(k8sImageTag) - if clusterMajorVersion != k8sImageMajorVersion { + if clusterMajorVersion != k8sImageMajorVersion && k8sImageMajorVersion != "" { clusterMajorVersion = k8sImageMajorVersion } @@ -631,5 +632,8 @@ func (c *Cluster) GetKubernetesServicesOptions() v3.KubernetesServicesOptions { func getTagMajorVersion(tag string) string { splitTag := strings.Split(tag, ".") + if len(splitTag) < 2 { + return "" + } return strings.Join(splitTag[:2], ".") }