Fix/ebpf verifier error#30
Merged
Merged
Conversation
Owning the main RouteTable from the Vpc (blockOwnerDeletion=true) plus the RouteTable delete guard could deadlock a foreground cascade: the Vpc lingers with a deletionTimestamp until its owned RouteTable is GC'd, but the guard refused to release the RouteTable while the Vpc still existed. Enforce a single delete order in the webhooks instead: - RouteTable ValidateDelete now allows deleting the main RouteTable once the owning Vpc is itself being deleted (deletionTimestamp set), so the garbage collector can cascade it. - Vpc ValidateDelete now blocks deletion while any Subnet still belongs to the Vpc, so by the time the Vpc terminates no Subnet references the main RouteTable and its Subnet guard is already satisfied.
Conflicts were limited to the compiled BPF objects (*.o), which both branches had regenerated from divergent source. Resolved by rebuilding all eBPF artifacts from the merged source via `make -C daemon generate-bpf`, so the objects reflect both the __u64 loop-counter fix (acl.h/sg.h) and develop's LoadBalancer dataplane (maps.h/lb.h/ node_ingress.c/pod_egress.c). The generated Go bindings were unchanged by our side (no struct-layout change) and merged cleanly to develop's.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.