Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
709ac9ce
Unverified
Commit
709ac9ce
authored
Oct 11, 2018
by
k8s-ci-robot
Committed by
GitHub
Oct 11, 2018
Browse files
Options
Browse Files
Download
Plain Diff
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
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
validation.go
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
+1
-1
No files found.
cmd/kubeadm/app/apis/kubeadm/validation/validation.go
View file @
709ac9ce
...
...
@@ -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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment