Merge pull request #78542 from neolit123/kubeadm-mixed-cert-key

kubeadm: disallow the mixture of --config and --certificate-key
2019-06-01 09:51:07 -07:00
parent e97514e205 d6f1dff1ce
commit c81ae93159
1 changed files with 0 additions and 1 deletions
--- a/cmd/kubeadm/app/apis/kubeadm/validation/validation.go
+++ b/cmd/kubeadm/app/apis/kubeadm/validation/validation.go
@@ -433,7 +433,6 @@ func isAllowedFlag(flagName string) bool {
 		kubeadmcmdoptions.KubeconfigDir,
 		kubeadmcmdoptions.UploadCerts,
 		kubeadmcmdoptions.ExperimentalUploadCerts,
-		kubeadmcmdoptions.CertificateKey,
 		"print-join-command", "rootfs", "v")
 	if knownFlags.Has(flagName) {
 		return true