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

clean up muti-err return 

Signed-off-by: wawa0210 <xiaozhang0210@hotmail.com>
This commit is contained in:
wawa0210 2021-11-02 23:21:30 +08:00
parent 3d19af85a0
commit e14ac56e58
No known key found for this signature in database
GPG Key ID: 900C83A2C098B3B1
1 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/karmadactl/cordon.go
View File

@ -171,13 +171,12 @@ func (c *CordonHelper) hasUnschedulerTaint() bool {
// PatchOrReplace uses given karmada clientset to update the cluster unschedulable scheduler, either by patching or // PatchOrReplace uses given karmada clientset to update the cluster unschedulable scheduler, either by patching or
// updating the given cluster object; it may return error if the object cannot be encoded as // updating the given cluster object; it may return error if the object cannot be encoded as
// JSON, or if either patch or update calls fail; it will also return a second error // JSON, or if either patch or update calls fail; it will also return error whenever creating a patch has failed
// whenever creating a patch has failed func (c *CordonHelper) PatchOrReplace(controlPlaneClient *karmadaclientset.Clientset) error {
func (c *CordonHelper) PatchOrReplace(controlPlaneClient *karmadaclientset.Clientset) (error, error) {
client := controlPlaneClient.ClusterV1alpha1().Clusters() client := controlPlaneClient.ClusterV1alpha1().Clusters()
oldData, err := json.Marshal(c.cluster) oldData, err := json.Marshal(c.cluster)
if err != nil { if err != nil {
return err, nil return err
} }
unschedulerTaint := corev1.Taint{ unschedulerTaint := corev1.Taint{
@ -201,16 +200,16 @@ func (c *CordonHelper) PatchOrReplace(controlPlaneClient *karmadaclientset.Clien
newData, err := json.Marshal(c.cluster) newData, err := json.Marshal(c.cluster)
if err != nil { if err != nil {
return err, nil return err
} }
patchBytes, patchErr := strategicpatch.CreateTwoWayMergePatch(oldData, newData, c.cluster) patchBytes, err := strategicpatch.CreateTwoWayMergePatch(oldData, newData, c.cluster)
if patchErr == nil { if err == nil {
_, err = client.Patch(context.TODO(), c.cluster.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{}) _, err = client.Patch(context.TODO(), c.cluster.Name, types.MergePatchType, patchBytes, metav1.PatchOptions{})
} else { } else {
_, err = client.Update(context.TODO(), c.cluster, metav1.UpdateOptions{}) _, err = client.Update(context.TODO(), c.cluster, metav1.UpdateOptions{})
} }
return err, patchErr return err
} }
// RunCordonOrUncordon exec marks the cluster unschedulable or schedulable according to desired. // RunCordonOrUncordon exec marks the cluster unschedulable or schedulable according to desired.
@ -242,10 +241,7 @@ func RunCordonOrUncordon(_ io.Writer, desired int, karmadaConfig KarmadaConfig,
} }
if !opts.DryRun { if !opts.DryRun {
err, patchErr := cordonHelper.PatchOrReplace(controlPlaneKarmadaClient) err := cordonHelper.PatchOrReplace(controlPlaneKarmadaClient)
if patchErr != nil {
return patchErr
}
if err != nil { if err != nil {
return err return err
} }