fix: If the PodList contains extra Pods, the judgment will fail.

Signed-off-by: tao.yang <[email protected]>
spidernet-io · Aug 5, 2024 · 27794c4 · 27794c4
1 parent 71bf7b1
commit 27794c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/lint-golang.yaml b/.github/workflows/lint-golang.yaml
@@ -212,7 +212,7 @@ jobs:
       # ============= upload coverage report
       - name: Upload to Codecov
         if: ${{ steps.unitest.outcome != 'failure' }}
-        uses: codecov/codecov-action@v3.1.4
+        uses: codecov/codecov-action@v4
         with:
           directory: './'
           files: 'coverage.out'

diff --git a/framework/deployment.go b/framework/deployment.go
@@ -270,7 +270,7 @@ func (f *Framework) RestartDeploymentPodUntilReady(deployName, namespace string,
 	if err != nil {
 		return err
 	}
-	_, err = f.DeletePodListUntilReady(podList, timeOut, opts...)
+	_, err = f.DeletePodListUntilReady(podList, int(*deployment.Spec.Replicas), timeOut, opts...)
 	if err != nil {
 		return err
 	}

diff --git a/framework/pod.go b/framework/pod.go
@@ -292,7 +292,7 @@ func (f *Framework) DeletePodListRepeatedly(label map[string]string, interval ti
 	}
 }
 
-func (f *Framework) DeletePodListUntilReady(podList *corev1.PodList, timeOut time.Duration, opts ...client.DeleteOption) (*corev1.PodList, error) {
+func (f *Framework) DeletePodListUntilReady(podList *corev1.PodList, expectedPodNum int, timeOut time.Duration, opts ...client.DeleteOption) (*corev1.PodList, error) {
 	if podList == nil {
 		return nil, ErrWrongInput
 	}
@@ -321,7 +321,7 @@ OUTER:
 			continue
 		}
 
-		if len(podListWithLabel.Items) != len(podList.Items) {
+		if len(podListWithLabel.Items) == 0 || len(podListWithLabel.Items) != expectedPodNum {
 			continue
 		}