From 1d4793562e8502dc8213935fdb8d6943259b4ffd Mon Sep 17 00:00:00 2001 From: yuexiao-wang Date: Mon, 13 Nov 2017 14:46:34 +0800 Subject: [PATCH] remove redundant code in ValidateDiscovery Signed-off-by: yuexiao-wang --- cmd/kubeadm/app/apis/kubeadm/validation/validation.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go index 034f1796bce..b852bf7f3bc 100644 --- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go +++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go @@ -120,12 +120,6 @@ func ValidateDiscovery(c *kubeadm.NodeConfiguration, fldPath *field.Path) field. allErrs = append(allErrs, ValidateToken(c.TLSBootstrapToken, fldPath)...) allErrs = append(allErrs, ValidateJoinDiscoveryTokenAPIServer(c, fldPath)...) - if len(c.DiscoveryToken) != 0 { - allErrs = append(allErrs, ValidateToken(c.DiscoveryToken, fldPath)...) - } - if len(c.DiscoveryFile) != 0 { - allErrs = append(allErrs, ValidateDiscoveryFile(c.DiscoveryFile, fldPath)...) - } return allErrs }