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

Merge pull request #833 from mrlihanbo/karmadactl-cleanup 

fatal when errors heppen in karmadactl
This commit is contained in:
karmada-bot 2021-10-19 21:00:05 +08:00 committed by GitHub
parent 9b97ca9222 a643c093f1
commit 5f452943d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/karmadactl/cordon.go
View File

@ -52,18 +52,16 @@ func NewCmdCordon(cmdOut io.Writer, karmadaConfig KarmadaConfig, cmdStr string)
Run: func(cmd *cobra.Command, args []string) {
err := opts.Complete(args)
if err != nil {
klog.Errorf("Error: %v", err)
return
klog.Fatalf("Error: %v", err)
}
if errs := opts.Validate(); len(errs) != 0 {
klog.Error(utilerrors.NewAggregate(errs).Error())
return
klog.Fatalf("Error: %v", utilerrors.NewAggregate(errs).Error())
}
err = RunCordonOrUncordon(cmdOut, desiredCordon, karmadaConfig, opts)
if err != nil {
klog.Errorf("Error: %v", err)
klog.Fatalf("Error: %v", err)
return
}
},

9
pkg/karmadactl/join.go
View File

@ -70,19 +70,16 @@ func NewCmdJoin(cmdOut io.Writer, karmadaConfig KarmadaConfig, cmdStr string) *c
// Set default values
err := opts.Complete(args)
if err != nil {
klog.Errorf("Error: %v", err)
return
klog.Fatalf("Error: %v", err)
}
if errs := opts.Validate(); len(errs) != 0 {
klog.Error(utilerrors.NewAggregate(errs).Error())
return
klog.Fatalf("Error: %v", utilerrors.NewAggregate(errs).Error())
}
err = RunJoin(cmdOut, karmadaConfig, opts)
if err != nil {
klog.Errorf("Error: %v", err)
return
klog.Fatalf("Error: %v", err)
}
},
}

6
pkg/karmadactl/unjoin.go
View File

@ -42,14 +42,12 @@ func NewCmdUnjoin(cmdOut io.Writer, karmadaConfig KarmadaConfig, cmdStr string)
Run: func(cmd *cobra.Command, args []string) {
err := opts.Complete(args)
if err != nil {
klog.Errorf("Error: %v", err)
return
klog.Fatalf("Error: %v", err)
}
err = RunUnjoin(cmdOut, karmadaConfig, opts)
if err != nil {
klog.Errorf("Error: %v", err)
return
klog.Fatalf("Error: %v", err)
}
},
}