From 7bf6ff2ec152ec2ecbffe4ef34628b20cee12418 Mon Sep 17 00:00:00 2001 From: SataQiu Date: Sun, 20 Jan 2019 08:42:09 +0800 Subject: [PATCH] print more error details about CertSANs validation --- cmd/kubeadm/app/apis/kubeadm/validation/validation.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index 15a9e0c90a..ac0465eb3b 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -307,8 +307,10 @@ func ValidateEtcd(e *kubeadm.Etcd, fldPath *field.Path) field.ErrorList { func ValidateCertSANs(altnames []string, fldPath *field.Path) field.ErrorList { allErrs := field.ErrorList{} for _, altname := range altnames { - if len(validation.IsDNS1123Subdomain(altname)) != 0 && net.ParseIP(altname) == nil { - allErrs = append(allErrs, field.Invalid(fldPath, altname, "altname is not a valid dns label or ip address")) + if errs := validation.IsDNS1123Subdomain(altname); len(errs) != 0 { + if net.ParseIP(altname) == nil { + allErrs = append(allErrs, field.Invalid(fldPath, altname, fmt.Sprintf("altname is not a valid IP address or DNS label: %s", strings.Join(errs, "; ")))) + } } } return allErrs