kubeadm: fix kubeadm join using existing certs

If 'kubeadm join' is run with --discovery-file option it still prompts for bootstrap token. This makes it impossible to use existing client certificates mentioned in the discovery file. Fixed by checking for empty bootstrap token only if discovery file is not specified. Fixes: kubernetes/kubeadm#1142

kubeadm: fix kubeadm join using existing certs
5b1cddef · Ed Bartosh · ecbc4a3a · 5b1cddef
Commit 5b1cddef authored Oct 01, 2018 by Ed Bartosh
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

validation.go cmd/kubeadm/app/apis/kubeadm/validation/validation.go +5 -1

No files found.
--- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go
+++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go
@@ -99,9 +99,13 @@ func ValidateDiscovery(c *kubeadm.JoinConfiguration) field.ErrorList {
 	}
 	if len(c.DiscoveryFile) != 0 {
 		allErrs = append(allErrs, ValidateDiscoveryFile(c.DiscoveryFile, field.NewPath("discoveryFile"))...)
+		if len(c.TLSBootstrapToken) != 0 {
+			allErrs = append(allErrs, ValidateToken(c.TLSBootstrapToken, field.NewPath("tlsBootstrapToken"))...)
+		}
+	} else {
+		allErrs = append(allErrs, ValidateToken(c.TLSBootstrapToken, field.NewPath("tlsBootstrapToken"))...)
 	}
 	allErrs = append(allErrs, ValidateArgSelection(c, field.NewPath("discovery"))...)
-	allErrs = append(allErrs, ValidateToken(c.TLSBootstrapToken, field.NewPath("tlsBootstrapToken"))...)
 	allErrs = append(allErrs, ValidateJoinDiscoveryTokenAPIServer(c.DiscoveryTokenAPIServers, field.NewPath("discoveryTokenAPIServers"))...)
 	return allErrs