Skip to content

fix(catalogs): requeue when flux resources not ready#1684

Closed
mikolajkucinski wants to merge 2 commits intomainfrom
fix/catalog-controller-requeue-on-pending
Closed

fix(catalogs): requeue when flux resources not ready#1684
mikolajkucinski wants to merge 2 commits intomainfrom
fix/catalog-controller-requeue-on-pending

Conversation

@mikolajkucinski
Copy link
Copy Markdown
Contributor

@mikolajkucinski mikolajkucinski commented Dec 18, 2025

Description

  • Track when flux resources are not ready and return lifecycle.Pending with RequeueAfter: 10s to ensure the controller retries promptly
  • Avoid redundant status updates when the condition is already set to prevent unnecessary watch events
  • Fix Expectg.Expect bug in e2e tests (using globally scoped Expect inside Eventually)
  • Re-fetch catalog inside Eventually to avoid stale data comparison

What type of PR is this? (check all applicable)

  • 🍕 Feature
  • 🐛 Bug Fix
  • 📝 Documentation Update
  • 🎨 Style
  • 🧑‍💻 Code Refactor
  • 🔥 Performance Improvements
  • ✅ Test
  • 🤖 Build
  • 🔁 CI
  • 📦 Chore (Release)
  • ⏩ Revert

Related Tickets & Documents

Added tests?

  • 👍 yes
  • 🙅 no, because they aren't needed
  • 🙋 no, because I need help
  • Separate ticket for tests # (issue/pr)

Added to documentation?

  • 📜 README.md
  • 🤝 Documentation pages updated
  • 🙅 no documentation needed
  • (if applicable) generated OpenAPI docs for CRD changes

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my code
  • I have commented my code, particularly in hard-to-understand areas
  • My changes generate no new warnings
  • New and existing unit tests pass locally with my changes

@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch 3 times, most recently from eee2a26 to 00552ca Compare December 18, 2025 14:18
@mikolajkucinski mikolajkucinski changed the title fix(catalog): requeue when flux resources not ready fix(catalogs): requeue when flux resources not ready Dec 18, 2025
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from 00552ca to b18fa8d Compare December 18, 2025 14:33
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from 63f0044 to 3af3425 Compare December 18, 2025 14:36
@github-actions github-actions Bot added the documentation Improvements or additions to documentation label Dec 18, 2025
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch 4 times, most recently from f40260a to df136dc Compare December 19, 2025 14:15
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from df136dc to cb6ec92 Compare January 19, 2026 09:45
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from cb6ec92 to e68928f Compare January 19, 2026 10:05
@github-actions github-actions Bot added size/L and removed size/S labels Jan 19, 2026
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from 9a9c745 to e68928f Compare January 19, 2026 11:51
@github-actions github-actions Bot added size/S and removed size/L labels Jan 19, 2026
On-behalf-of: @SAP mikolaj.kucinski@sap.com
@mikolajkucinski mikolajkucinski force-pushed the fix/catalog-controller-requeue-on-pending branch from e68928f to 6b61ce0 Compare January 19, 2026 11:54
@mikolajkucinski mikolajkucinski marked this pull request as ready for review January 20, 2026 13:42
@mikolajkucinski mikolajkucinski requested a review from a team as a code owner January 20, 2026 13:42
@abhijith-darshan
Copy link
Copy Markdown
Contributor

The E2E tests are stable now for Catalog.... Occasional timeouts happen due to resource constrains - https://github.com/cloudoperators/greenhouse/actions/runs/22084480838

But in general it is stable now - https://github.com/cloudoperators/greenhouse/actions/workflows/ci-e2e-test-nightly.yaml

FMPOV this PR can be closed for now.

@IvoGoman
Copy link
Copy Markdown
Contributor

Closing as the test failures are resolved meanwhile

@IvoGoman IvoGoman closed this Mar 12, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

core-apis documentation Improvements or additions to documentation helm-charts size/S

Projects

None yet

Development

Successfully merging this pull request may close these issues.

🐛 [BUG] - flaky catalog E2E test

3 participants