Skip to content

Conversation

@tmjd
Copy link
Member

@tmjd tmjd commented Oct 17, 2025

Description

We've still been getting flakes in the FV tests that have seemed to be related to teardown or not waiting long enough at teardown. These changes attempt to adjust mostly the test code but also the core controller to properly wait for cleanup or updates.

Release Note

TBD

For PR author

  • Tests for change.
  • If changing pkg/apis/, run make gen-files
  • If changing versions, run make gen-versions

For PR reviewers

A note for code reviewers - all pull requests must have the following:

  • Milestone set according to targeted release.
  • Appropriate labels:
    • kind/bug if this is a bugfix.
    • kind/enhancement if this is a a new feature.
    • enterprise if this PR applies to Calico Enterprise only.

@tmjd tmjd requested a review from a team as a code owner October 17, 2025 19:53
@marvin-tigera marvin-tigera added this to the v1.41.0 milestone Oct 17, 2025
@tmjd tmjd force-pushed the some-fixes branch 2 times, most recently from 771f16d to 1618f0e Compare October 20, 2025 17:35
@tmjd tmjd force-pushed the some-fixes branch 4 times, most recently from cb58e7f to 3afa009 Compare October 29, 2025 15:55
}
return fmt.Errorf("Only %d available replicas", ds.Status.NumberAvailable)
}, 240*time.Second).Should(BeNil())
By(fmt.Sprintf("calico-node daemonset %v", ds.Status))
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this belongs as a test step

Suggested change
By(fmt.Sprintf("calico-node daemonset %v", ds.Status))

But could be a log line if you want to keep it for debugging?

Copy link
Member

@caseydavenport caseydavenport left a comment

Choose a reason for hiding this comment

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

One small comment, and would be nice to find a way to use the common helper function for this if possible. But otherwise this LGTM. Thanks @tmjd !

tmjd added 3 commits October 30, 2025 12:23
Fix test to wait for all calico-node to be available

Wait for generation update

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

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants