mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-25 20:53:33 +00:00
Merge pull request #69624 from bart0sh/PR0029-kubeadm-token-mix-config-with-print-join-command
kubeadm: allow usage --config with --print-join-command
This commit is contained in:
commit
709ac9ce85
@ -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
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user