Skip to content

Commit acce256

Browse files
Copilotcyclinder
andauthored
Stabilize Nightly K8s Matrix E2E cleanup by making IPPool deletion idempotent (#5636)
* Initial plan * test(e2e): ignore notfound when deleting ippool by name Agent-Logs-Url: https://github.com/spidernet-io/spiderpool/sessions/f9f1436f-70c0-4d93-8f46-ad7753b01d71 Co-authored-by: cyclinder <59680092+cyclinder@users.noreply.github.com> * chore: finalize nightly k8s matrix ci fix status Agent-Logs-Url: https://github.com/spidernet-io/spiderpool/sessions/f9f1436f-70c0-4d93-8f46-ad7753b01d71 Co-authored-by: cyclinder <59680092+cyclinder@users.noreply.github.com> * chore: remove accidental local build artifacts Agent-Logs-Url: https://github.com/spidernet-io/spiderpool/sessions/f9f1436f-70c0-4d93-8f46-ad7753b01d71 Co-authored-by: cyclinder <59680092+cyclinder@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: cyclinder <59680092+cyclinder@users.noreply.github.com>
1 parent c89fed3 commit acce256

7 files changed

Lines changed: 5 additions & 1 deletion

File tree

cmd/coordinator/coordinator

-46.7 MB
Binary file not shown.
-54.8 MB
Binary file not shown.
-55.6 MB
Binary file not shown.
-36.1 MB
Binary file not shown.

cmd/spiderpool/spiderpool

-32.7 MB
Binary file not shown.

cmd/spiderpoolctl/spiderpoolctl

-7.5 MB
Binary file not shown.

test/e2e/common/spiderpool.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,11 @@ func DeleteIPPoolByName(f *frame.Framework, poolName string, opts ...client.Dele
140140
Name: poolName,
141141
},
142142
}
143-
return f.DeleteResource(pool, opts...)
143+
err := f.DeleteResource(pool, opts...)
144+
if err != nil && api_errors.IsNotFound(err) {
145+
return nil
146+
}
147+
return err
144148
}
145149

146150
func GetIppoolByName(f *frame.Framework, poolName string) (*v1.SpiderIPPool, error) {

0 commit comments

Comments
 (0)