From 48e1838f6cb59318e571fcc37a7377d2ce265cfa Mon Sep 17 00:00:00 2001 From: Humble Chirammal Date: Mon, 1 Apr 2019 09:13:26 +0530 Subject: [PATCH] Remove unwanted `else` block from statefulset controller. Signed-off-by: Humble Chirammal --- .../statefulset/stateful_pod_control_test.go | 4 ++-- .../statefulset/stateful_set_status_updater_test.go | 4 ++-- pkg/controller/statefulset/stateful_set_test.go | 13 +++++++------ 3 files changed, 11 insertions(+), 10 deletions(-) diff --git a/pkg/controller/statefulset/stateful_pod_control_test.go b/pkg/controller/statefulset/stateful_pod_control_test.go index 31ea8ac4674..e2428d64852 100644 --- a/pkg/controller/statefulset/stateful_pod_control_test.go +++ b/pkg/controller/statefulset/stateful_pod_control_test.go @@ -374,9 +374,9 @@ func TestStatefulPodControlUpdatePodConflictSuccess(t *testing.T) { if !conflict { conflict = true return true, update.GetObject(), apierrors.NewConflict(action.GetResource().GroupResource(), pod.Name, errors.New("conflict")) - } else { - return true, update.GetObject(), nil } + return true, update.GetObject(), nil + }) pod.Name = "goo-0" if err := control.UpdateStatefulPod(set, pod); err != nil { diff --git a/pkg/controller/statefulset/stateful_set_status_updater_test.go b/pkg/controller/statefulset/stateful_set_status_updater_test.go index 1f4ab9c5b81..8cbb25da6f5 100644 --- a/pkg/controller/statefulset/stateful_set_status_updater_test.go +++ b/pkg/controller/statefulset/stateful_set_status_updater_test.go @@ -96,9 +96,9 @@ func TestStatefulSetStatusUpdaterUpdateReplicasConflict(t *testing.T) { if !conflict { conflict = true return true, update.GetObject(), apierrors.NewConflict(action.GetResource().GroupResource(), set.Name, errors.New("Object already exists")) - } else { - return true, update.GetObject(), nil } + return true, update.GetObject(), nil + }) if err := updater.UpdateStatefulSetStatus(set, &status); err != nil { t.Errorf("UpdateStatefulSetStatus returned an error: %s", err) diff --git a/pkg/controller/statefulset/stateful_set_test.go b/pkg/controller/statefulset/stateful_set_test.go index 7d9a7cc1629..e1762152a38 100644 --- a/pkg/controller/statefulset/stateful_set_test.go +++ b/pkg/controller/statefulset/stateful_set_test.go @@ -648,11 +648,11 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl if err := assertMonotonicInvariants(set, spc); err != nil { return err } - if obj, _, err := spc.setsIndexer.Get(set); err != nil { + obj, _, err := spc.setsIndexer.Get(set) + if err != nil { return err - } else { - set = obj.(*apps.StatefulSet) } + set = obj.(*apps.StatefulSet) } return assertMonotonicInvariants(set, spc) @@ -701,11 +701,12 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr spc.DeleteStatefulPod(set, pod) ssc.deletePod(pod) fakeWorker(ssc) - if obj, _, err := spc.setsIndexer.Get(set); err != nil { + obj, _, err := spc.setsIndexer.Get(set) + if err != nil { return err - } else { - set = obj.(*apps.StatefulSet) } + set = obj.(*apps.StatefulSet) + } return assertMonotonicInvariants(set, spc) }