[v3.31] felix/fv: wait for Felix to be ready before asserting on status files - #13882
Open
aaaaaaaalex wants to merge 1 commit into
Open
[v3.31] felix/fv: wait for Felix to be ready before asserting on status files#13882aaaaaaaalex wants to merge 1 commit into
aaaaaaaalex wants to merge 1 commit into
Conversation
…t-startup felix/fv: wait for Felix to be ready before asserting on status files (cherry picked from commit 372fa68)
Contributor
There was a problem hiding this comment.
🟢 Approval recommended
No unresolved review comments remain, and the supplied assessments indicate approval readiness.
Pull request overview
Updates Felix FV tests to wait for Felix readiness and dataplane sync before asserting status files, improving reliability on loaded CI runners.
Changes:
- Adds shared startup and readiness waiting.
- Applies synchronization to endpoint-status scenarios.
- Improves stale-file polling and corrects the status-file path.
File summaries
| File | Description |
|---|---|
felix/fv/pod_setup_wait_test.go |
Improves Felix startup synchronization in FV tests. |
Review details
- Files reviewed: 1/1 changed files
- Comments generated: 0
- Review effort level: Lite
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
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
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.
Cherry-pick history
Waits for Felix to be ready before the assertions in the
Pod setup status waitFV suite, so their 10s deadlines no longer have to cover Felix start-up too — which is what times out on a loaded CI runner. CORE-13626Conflict resolved by hand
This branch's copy of the file is older than master's:
//go:build fvtests, Ginkgo v1 imports, anodeCountconst,StartNNodeTopology, an explicitAfterEach, andStart()without aninfraargument. Those regions are untouched by the pick and applied without trouble.The one conflict was in
should create endpoint-status files, which on this branch callsTriggerDelayedStart()with no in-sync wait at all, where master already had one. Resolved to match master's end state, so that test now calls the shared helper and gains both the readiness wait and an in-sync wait it previously lacked. That is deliberate: with no in-sync wait, itsstatCmds10s deadline had to cover the whole of Felix start-up, which makes it the most exposed test on this branch rather than the least.The resulting file is byte-identical to the equivalent pick on the matching enterprise branch, which is the same file vintage.
Verified on this branch:
go vet -tags fvtests -composites=false ./felix/fv/is clean.WaitForReadyexists here, so the helper resolves. No FV run yet.Release note:
AI assistance: Claude Code (Opus 5) performed the cherry-pick, resolved the conflict, and wrote this description.
By opening this PR you take responsibility for every line in it, and you agree to explain the change yourself during review rather than routing review comments back through an agent. See AI_POLICY.md.
🤖 Generated with Claude Code
Cherry-Pick PR details
projectcalico/calicoprojectcalico/calicorelease-v3.31