Merge pull request #69288 from bart0sh/PR0028-kubeadm-fix-1142-join-existing-client-certs

kubeadm: fix kubeadm join using existing certs

Merge pull request #69288 from bart0sh/PR0028-kubeadm-fix-1142-join-existing-client-certs
72bd1338 · k8s-ci-robot · GitHub · 2a544bc7 · b1b719fa · 72bd1338
Unverified Commit 72bd1338 authored Oct 01, 2018 by k8s-ci-robot Committed by GitHub Oct 01, 2018
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