Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

e2e fix: restarting spiderpool-controller failed #3825

Closed
wants to merge 1 commit into from
Closed

e2e fix: restarting spiderpool-controller failed #3825

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions test/e2e/reclaim/reclaim_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ var _ = Describe("test ip with reclaim ip case", Label("reclaim"), func() {
Expect(err).NotTo(HaveOccurred())
Expect(spiderpoolControllerPodList).NotTo(BeNil(), "failed to get spiderpool controller podList \n")
Expect(spiderpoolControllerPodList.Items).NotTo(BeEmpty(), "failed to get spiderpool controller podList \n")
spiderpoolControllerPodList, err = frame.DeletePodListUntilReady(spiderpoolControllerPodList, common.PodReStartTimeout)
spiderpoolControllerPodList, err = frame.DeletePodListUntilReady(spiderpoolControllerPodList, common.PodReStartTimeout, &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})
Expect(err).NotTo(HaveOccurred())
Expect(spiderpoolControllerPodList).NotTo(BeNil(), "failed to get spiderpool controller podList after restart \n")
Expect(spiderpoolControllerPodList.Items).NotTo(HaveLen(0), "failed to get spiderpool controller podList \n")
Expand Down Expand Up @@ -710,7 +710,7 @@ var _ = Describe("test ip with reclaim ip case", Label("reclaim"), func() {
}
}
}
Expect(frame.DeletePodList(deletePodList)).NotTo(HaveOccurred(), client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})
Expect(frame.DeletePodList(deletePodList, &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})).NotTo(HaveOccurred())

commandStr = "systemctl start kubelet"
output, err = frame.DockerExecCommand(ctx, workerNodeName, commandStr)
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/spidercoordinator/spidercoordinator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,7 +531,7 @@ var _ = Describe("SpiderCoordinator", Label("spidercoordinator", "overlay"), Ser
Expect(err).NotTo(HaveOccurred())

if len(podList.Items) != 0 {
Expect(frame.DeletePodList(podList)).NotTo(HaveOccurred(), client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})
Expect(frame.DeletePodList(podList, &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})).NotTo(HaveOccurred())
}

Eventually(func() bool {
Expand Down Expand Up @@ -603,7 +603,7 @@ var _ = Describe("SpiderCoordinator", Label("spidercoordinator", "overlay"), Ser
})
Expect(err).NotTo(HaveOccurred())
if len(podList.Items) != 0 {
Expect(frame.DeletePodList(podList)).NotTo(HaveOccurred(), client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})
Expect(frame.DeletePodList(podList, &client.DeleteOptions{GracePeriodSeconds: ptr.To(int64(0))})).NotTo(HaveOccurred())
}

Eventually(func() bool {
Expand Down
Loading