github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 18:00:08 +00:00
Code Issues 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
commit c81ae93159
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show Stats 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