[KCP] Fix semver version validation for KCP spec.version

kubernetes-sigs · Mar 16, 2020 · 5316a10 · 5316a10
1 parent d18710f
commit 5316a10
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook.go b/controlplane/kubeadm/api/v1alpha3/kubeadm_control_plane_webhook.go
@@ -18,6 +18,7 @@ package v1alpha3
 
 import (
 	"encoding/json"
+	"strings"
 
 	"github.com/blang/semver"
 	jsonpatch "github.com/evanphx/json-patch"
@@ -229,8 +230,10 @@ func (in *KubeadmControlPlane) validateCommon() (allErrs field.ErrorList) {
 		)
 	}
 
-	_, err := semver.ParseTolerant(in.Spec.Version)
-	if err != nil {
+	version := strings.TrimSpace(in.Spec.Version)
+	version = strings.TrimPrefix(version, "v")
+
+	if _, err := semver.Parse(version); err != nil {
 		allErrs = append(allErrs, field.Invalid(field.NewPath("spec", "version"), in.Spec.Version, "must be a valid semantic version"))
 	}