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
b9816b12
Commit
b9816b12
authored
Feb 05, 2019
by
Lubomir I. Ivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
kubeadm: remove warning about config usage
parent
f0beaf46
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
8 deletions
+5
-8
selfhosting.go
cmd/kubeadm/app/cmd/alpha/selfhosting.go
+1
-1
config.go
cmd/kubeadm/app/cmd/config.go
+1
-1
init.go
cmd/kubeadm/app/cmd/init.go
+1
-4
token.go
cmd/kubeadm/app/cmd/token.go
+2
-2
No files found.
cmd/kubeadm/app/cmd/alpha/selfhosting.go
View file @
b9816b12
...
...
@@ -141,7 +141,7 @@ func getSelfhostingSubCommand(in io.Reader) *cobra.Command {
// Add flags to the command
// flags bound to the configuration object
cmd
.
Flags
()
.
StringVar
(
&
cfg
.
CertificatesDir
,
"cert-dir"
,
cfg
.
CertificatesDir
,
`The path where certificates are stored`
)
cmd
.
Flags
()
.
StringVar
(
&
cfgPath
,
"config"
,
cfgPath
,
"Path to a kubeadm config file. WARNING: Usage of a configuration file is experimental"
)
options
.
AddConfigFlag
(
cmd
.
Flags
(),
&
cfgPath
)
cmd
.
Flags
()
.
BoolVarP
(
&
certsInSecrets
,
"store-certs-in-secrets"
,
"s"
,
...
...
cmd/kubeadm/app/cmd/config.go
View file @
b9816b12
...
...
@@ -329,7 +329,7 @@ func NewCmdConfigUploadFromFile(out io.Writer, kubeConfigFile *string) *cobra.Co
kubeadmutil
.
CheckErr
(
err
)
},
}
cmd
.
Flags
()
.
StringVar
(
&
cfgPath
,
"config"
,
""
,
"Path to a kubeadm config file. WARNING: Usage of a configuration file is experimental."
)
options
.
AddConfigFlag
(
cmd
.
Flags
(),
&
cfgPath
)
return
cmd
}
...
...
cmd/kubeadm/app/cmd/init.go
View file @
b9816b12
...
...
@@ -238,10 +238,7 @@ func AddInitConfigFlags(flagSet *flag.FlagSet, cfg *kubeadmapiv1beta1.InitConfig
// AddInitOtherFlags adds init flags that are not bound to a configuration file to the given flagset
func
AddInitOtherFlags
(
flagSet
*
flag
.
FlagSet
,
cfgPath
*
string
,
skipTokenPrint
,
dryRun
*
bool
,
ignorePreflightErrors
*
[]
string
)
{
flagSet
.
StringVar
(
cfgPath
,
options
.
CfgPath
,
*
cfgPath
,
"Path to kubeadm config file. WARNING: Usage of a configuration file is experimental."
,
)
options
.
AddConfigFlag
(
flagSet
,
cfgPath
)
flagSet
.
StringSliceVar
(
ignorePreflightErrors
,
options
.
IgnorePreflightErrors
,
*
ignorePreflightErrors
,
"A list of checks whose errors will be shown as warnings. Example: 'IsPrivilegedUser,Swap'. Value 'all' ignores errors from all checks."
,
...
...
cmd/kubeadm/app/cmd/token.go
View file @
b9816b12
...
...
@@ -129,8 +129,8 @@ func NewCmdToken(out io.Writer, errW io.Writer) *cobra.Command {
kubeadmutil
.
CheckErr
(
err
)
},
}
createCmd
.
Flags
()
.
StringVar
(
&
cfgPath
,
"config"
,
cfgPath
,
"Path to kubeadm config file (WARNING: Usage of a configuration file is experimental)"
)
options
.
AddConfigFlag
(
createCmd
.
Flags
(),
&
cfgPath
)
createCmd
.
Flags
()
.
BoolVar
(
&
printJoinCommand
,
"print-join-command"
,
false
,
"Instead of printing only the token, print the full 'kubeadm join' flag needed to join the cluster using the token."
)
bto
.
AddTTLFlagWithName
(
createCmd
.
Flags
(),
"ttl"
)
...
...
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