github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
kubeadm: disallow the mixture of --config and --certificate-key
This commit is contained in:
Kubernetes Prow Robot
2019-06-01 09:51:07 -07:00
committed by GitHub
parent e97514e205 d6f1dff1ce
commit c81ae93159
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View File

@@ -433,7 +433,6 @@ func isAllowedFlag(flagName string) bool {
kubeadmcmdoptions.KubeconfigDir, kubeadmcmdoptions.KubeconfigDir,
kubeadmcmdoptions.UploadCerts, kubeadmcmdoptions.UploadCerts,
kubeadmcmdoptions.ExperimentalUploadCerts, kubeadmcmdoptions.ExperimentalUploadCerts,
kubeadmcmdoptions.CertificateKey,
"print-join-command", "rootfs", "v") "print-join-command", "rootfs", "v")
if knownFlags.Has(flagName) { if knownFlags.Has(flagName) {
return true return true