Unverified Commit 709ac9ce authored by k8s-ci-robot's avatar k8s-ci-robot Committed by GitHub

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

kubeadm: allow usage --config with --print-join-command
parents 539bdbc3 eacff943
......@@ -380,7 +380,7 @@ func ValidateMixedArguments(flag *pflag.FlagSet) error {
mixedInvalidFlags := []string{}
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
return
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment