github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #74952 from ping035627/k8s-190305 

Fix some typos
pull/564/head
Kubernetes Prow Robot 2019-03-06 02:08:02 -08:00 committed by GitHub
parent 9c75270b2b 55dac4804f
commit e15ebcd632
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/cmd/join.go
View File

@ -282,7 +282,7 @@ func addJoinOtherFlags(flagSet *flag.FlagSet, joinOptions *joinOptions) {
// newJoinOptions returns a struct ready for being used for creating cmd join flags. // newJoinOptions returns a struct ready for being used for creating cmd join flags.
func newJoinOptions() *joinOptions { func newJoinOptions() *joinOptions {
// initialize the public kubeadm config API by appling defaults // initialize the public kubeadm config API by applying defaults
externalcfg := &kubeadmapiv1beta1.JoinConfiguration{} externalcfg := &kubeadmapiv1beta1.JoinConfiguration{}
// Add optional config objects to host flags. // Add optional config objects to host flags.
@ -324,7 +324,7 @@ func newJoinData(cmd *cobra.Command, args []string, opt *joinOptions, out io.Wri
opt.externalcfg.Discovery.File = nil opt.externalcfg.Discovery.File = nil
} }
// if an APIServerEndpoint from which to retrive cluster information was not provided, unset the Discovery.BootstrapToken object // if an APIServerEndpoint from which to retrieve cluster information was not provided, unset the Discovery.BootstrapToken object
if len(args) == 0 { if len(args) == 0 {
opt.externalcfg.Discovery.BootstrapToken = nil opt.externalcfg.Discovery.BootstrapToken = nil
} else { } else {