Skip to content

[v3.31] felix/fv: wait for Felix to be ready before asserting on status files - #13882

Open
aaaaaaaalex wants to merge 1 commit into
release-v3.31from
auto-pick-of-#13815-origin-release-v3.31
Open

[v3.31] felix/fv: wait for Felix to be ready before asserting on status files#13882
aaaaaaaalex wants to merge 1 commit into
release-v3.31from
auto-pick-of-#13815-origin-release-v3.31

Conversation

@aaaaaaaalex

@aaaaaaaalex aaaaaaaalex commented Sep 11, 2026

Copy link
Copy Markdown
Contributor

Cherry-pick history

Waits for Felix to be ready before the assertions in the Pod setup status wait FV 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-13626

Conflict resolved by hand

This branch's copy of the file is older than master's: //go:build fvtests, Ginkgo v1 imports, a nodeCount const, StartNNodeTopology, an explicit AfterEach, and Start() without an infra argument. 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 calls TriggerDelayedStart() 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, its statCmds 10s 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. WaitForReady exists here, so the helper resolves. No FV run yet.

Release note:

None

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
  • Original PR ID: 13815
  • Original Commit SHA: 372fa68
  • Source Repo: projectcalico/calico
  • Target Repo: projectcalico/calico
  • Target Branch: release-v3.31

…t-startup

felix/fv: wait for Felix to be ready before asserting on status files

(cherry picked from commit 372fa68)
@aaaaaaaalex
aaaaaaaalex requested a review from a team as a code owner September 11, 2026 09:29
Copilot AI lite review requested due to automatic review settings September 11, 2026 09:29
@marvin-tigera marvin-tigera added this to the Calico v3.31.8 milestone Sep 11, 2026
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Sep 11, 2026
@aaaaaaaalex aaaaaaaalex added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact and removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Sep 11, 2026
@marvin-tigera marvin-tigera added release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented and removed docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact labels Sep 11, 2026
@aaaaaaaalex aaaaaaaalex added docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact labels Sep 11, 2026
@marvin-tigera marvin-tigera removed release-note-required Change has user-facing impact (no matter how small) docs-pr-required Change is not yet documented labels Sep 11, 2026

Copilot AI left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🟢 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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-not-required Docs not required for this change release-note-not-required Change has no user-facing impact

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants