kubeovn / kube-ovn / 31781653975

32%

Build Type

push

github

Committed by web-flow

Commit Message

fix: reconcile terminating OVN EIP/FIP/DNAT/SNAT from the add handler on restart (#7220)

OVN EIP/FIP/DNAT/SNAT deletion cleanup only runs in handleUpdateOvn*. On restart
the informer re-lists existing objects and fires only AddFunc; with resync=0 a
terminating object lands in the add queue, hits the already-ok short-circuit and
never removes its finalizer. Route terminating objects to the update queue via a
new enqueueUpdateIfTerminatingWithFinalizer helper that mirrors the OVN update
handlers: terminating objects without a finalizer are skipped (cleanup done,
awaiting apiserver deletion) to avoid a double delete. enqueueAddOvnEip keeps its
requeueRouterLBRulesForEip side effect regardless.

test: verify OVN enqueue-add routing for terminating objects

Cover live->add, terminating+finalizer->update, terminating-without-finalizer->skip
for OvnEip/OvnFip/OvnDnatRule/OvnSnatRule via a shared assertEnqueueAddRoutingWithFinalizer.

refactor: reuse terminating-route helper in OVN update handlers

The four enqueueUpdateOvn* deletion branches duplicated the terminating->update-queue
logic now provided by enqueueUpdateIfTerminatingWithFinalizer. Reuse the helper to
remove the duplication; the enqueue log unifies to V(3) "enqueue update to clean".

test: cover router LB rule requeue for a terminating OVN eip

enqueueAddOvnEip must still requeue an EIP's RouterLBRules when the EIP is terminating;
the side effect runs before the terminating route returns.

Signed-off-by: zbb88888 <jmdxjsjgcxy@gmail.com>

Coverage Stats

32 of 36 new or added lines in 5 files covered. (88.89%)

6 existing lines in 5 files now uncovered.

20972 of 64585 relevant lines covered (32.47%)

0.38 hits per line