mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-30 15:05:27 +00:00
Merge pull request #51062 from alrs/fix-statefulset-test-swallowed-errors
Automatic merge from submit-queue (batch tested with PRs 50980, 46902, 51051, 51062, 51020) Fix swallowed errors in statefulset tests **What this PR does / why we need it**: Fixes errors that were being swallowed in the tests of the statefulset package. ```release-note NONE ```
This commit is contained in:
commit
57ab7c6a64
@ -474,6 +474,9 @@ func TestStatefulSetControl_getSetRevisions(t *testing.T) {
|
||||
t.Fatal(err)
|
||||
}
|
||||
current, update, _, err := ssc.getStatefulSetRevisions(test.set, revisions)
|
||||
if err != nil {
|
||||
t.Fatalf("error getting statefulset revisions:%v", err)
|
||||
}
|
||||
revisions, err = ssc.ListRevisions(test.set)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
|
@ -615,6 +615,9 @@ func scaleUpStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetControl
|
||||
}
|
||||
for set.Status.ReadyReplicas < *set.Spec.Replicas {
|
||||
pods, err := spc.podsLister.Pods(set.Namespace).List(selector)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
ord := len(pods) - 1
|
||||
pod := getPodAtOrdinal(pods, ord)
|
||||
if pods, err = spc.setPodPending(set, ord); err != nil {
|
||||
@ -669,6 +672,9 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
|
||||
ssc.enqueueStatefulSet(set)
|
||||
fakeWorker(ssc)
|
||||
pods, err = spc.addTerminatingPod(set, ord)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
pod = getPodAtOrdinal(pods, ord)
|
||||
ssc.updatePod(&prev, pod)
|
||||
fakeWorker(ssc)
|
||||
@ -677,8 +683,15 @@ func scaleDownStatefulSetController(set *apps.StatefulSet, ssc *StatefulSetContr
|
||||
fakeWorker(ssc)
|
||||
for set.Status.Replicas > *set.Spec.Replicas {
|
||||
pods, err = spc.podsLister.Pods(set.Namespace).List(selector)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
ord := len(pods)
|
||||
pods, err = spc.addTerminatingPod(set, ord)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
pod = getPodAtOrdinal(pods, ord)
|
||||
ssc.updatePod(&prev, pod)
|
||||
fakeWorker(ssc)
|
||||
|
Loading…
Reference in New Issue
Block a user