github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 21:17:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #69624 from bart0sh/PR0029-kubeadm-token-mix-config-with-print-join-command

Browse Source 
kubeadm: allow usage --config with --print-join-command
This commit is contained in:
k8s-ci-robot 2018-10-11 11:06:58 -07:00 committed by GitHub
commit 709ac9ce85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -380,7 +380,7 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error {
mixedInvalidFlags := []string{} mixedInvalidFlags := []string{}
flag.Visit(func(f *pflag.Flag) { flag.Visit(func(f *pflag.Flag) {
if f.Name == "config" || f.Name == "ignore-preflight-errors" || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" || f.Name == "v" || f.Name == "rootfs" { if f.Name == "config" || f.Name == "ignore-preflight-errors" || strings.HasPrefix(f.Name, "skip-") || f.Name == "dry-run" || f.Name == "kubeconfig" || f.Name == "v" || f.Name == "rootfs" || f.Name == "print-join-command" {
// "--skip-*" flags or other whitelisted flags can be set with --config // "--skip-*" flags or other whitelisted flags can be set with --config
return return
} }