github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-21 10:51:29 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #75922 from humblec/stateful_set

Browse Source 
Remove unwanted `else` block from statefulset controller.
This commit is contained in:
Kubernetes Prow Robot 2019-07-10 00:12:25 -07:00 committed by GitHub
commit dc8829df5c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 10 deletions
Show Stats 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 { if !conflict {
conflict = true conflict = true
return true, update.GetObject(), apierrors.NewConflict(action.GetResource().GroupResource(), pod.Name, errors.New("conflict")) 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" pod.Name = "goo-0"
if err := control.UpdateStatefulPod(set, pod); err != nil { 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 { if !conflict {
conflict = true conflict = true
return true, update.GetObject(), apierrors.NewConflict(action.GetResource().GroupResource(), set.Name, errors.New("Object already exists")) 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 { if err := updater.UpdateStatefulSetStatus(set, &status); err != nil {
t.Errorf("UpdateStatefulSetStatus returned an error: %s", err) 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 { if err := assertMonotonicInvariants(set, spc); err != nil {
return err return err
} }
if obj, _, err := spc.setsIndexer.Get(set); err != nil { obj, _, err := spc.setsIndexer.Get(set)
if err != nil {
return err return err
} else {
set = obj.(*apps.StatefulSet)
} }
set = obj.(*apps.StatefulSet)
} }
return assertMonotonicInvariants(set, spc) return assertMonotonicInvariants(set, spc)
@ -701,11 +701,12 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
spc.DeleteStatefulPod(set, pod) spc.DeleteStatefulPod(set, pod)
ssc.deletePod(pod) ssc.deletePod(pod)
fakeWorker(ssc) fakeWorker(ssc)
if obj, _, err := spc.setsIndexer.Get(set); err != nil { obj, _, err := spc.setsIndexer.Get(set)
if err != nil {
return err return err
} else {
set = obj.(*apps.StatefulSet)
} }
set = obj.(*apps.StatefulSet)
} }
return assertMonotonicInvariants(set, spc) return assertMonotonicInvariants(set, spc)
} }