Skip to content

K
k3s
Unverified Commit e15ebcd6 authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #74952 from ping035627/k8s-190305

Fix some typos
parents 9c75270b 55dac480
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
cmd/kubeadm/app/cmd/join.go
View file @ e15ebcd6
...@@ -282,7 +282,7 @@ func addJoinOtherFlags(flagSet *flag.FlagSet, joinOptions *joinOptions) { ...@@ -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 ...@@ -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 {
......
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