scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unwanted else block from statefulset controller.

Browse Source 
Signed-off-by: Humble Chirammal <hchiramm@redhat.com>
This commit is contained in:
Humble Chirammal
2019-04-01 09:13:26 +05:30
parent 1b711267b4
commit 48e1838f6c
3 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/controller/statefulset/stateful_pod_control_test.go
View File

@@ -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 {

4
pkg/controller/statefulset/stateful_set_status_updater_test.go
View File

@@ -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)

13
pkg/controller/statefulset/stateful_set_test.go
View File

@@ -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)
}