Merge pull request kubernetes#80891 from bart0sh/PR0076-kubeadm-handle-joinControPlaneDoneTemp.Execute-errors

k8s-ci-robot · web-flow · commit f6bc0ea03e5a · 2019-08-02T08:44:05.000-07:00
handle joinControPlaneDoneTemp.Execute errors
diff --git a/cmd/kubeadm/app/cmd/join.go b/cmd/kubeadm/app/cmd/join.go
@@ -179,7 +179,8 @@ func NewCmdJoin(out io.Writer, joinOptions *joinOptions) *cobra.Command {
 					"KubeConfigPath": kubeadmconstants.GetAdminKubeConfigPath(),
 					"etcdMessage":    etcdMessage,
 				}
-				joinControPlaneDoneTemp.Execute(data.outputWriter, ctx)
+				err = joinControPlaneDoneTemp.Execute(data.outputWriter, ctx)
+				kubeadmutil.CheckErr(err)
 
 			} else {
 				// otherwise, if the node joined as a worker node;

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,8 @@ func NewCmdJoin(out io.Writer, joinOptions joinOptions) cobra.Command {`
`179`	`179`	`"KubeConfigPath": kubeadmconstants.GetAdminKubeConfigPath(),`
`180`	`180`	`"etcdMessage": etcdMessage,`
`181`	`181`	`}`
`182`		`- joinControPlaneDoneTemp.Execute(data.outputWriter, ctx)`
	`182`	`+ err = joinControPlaneDoneTemp.Execute(data.outputWriter, ctx)`
	`183`	`+ kubeadmutil.CheckErr(err)`
`183`	`184`
`184`	`185`	`} else {`
`185`	`186`	`// otherwise, if the node joined as a worker node;`