Skip to content

ROX-28223: Pause-reconcile handler - #426

Merged
perdasilva merged 6 commits into
operator-framework:mainfrom
vladbologa:vb/pause-reconcile
Mar 13, 2025
Merged

ROX-28223: Pause-reconcile handler#426
perdasilva merged 6 commits into
operator-framework:mainfrom
vladbologa:vb/pause-reconcile

Conversation

@vladbologa

@vladbologavladbologa commented Feb 24, 2025

Copy link
Copy Markdown
Contributor

This PR upstreams a feature from the https://github.com/stackrox/helm-operator fork used by ACS (Advanced Cluster Security)

Source commit: stackrox/helm-operator@30a1ac3
Original PR: stackrox/helm-operator#29

The PR implements support for a "pause reconcile" handler, which determines if the reconcile should be paused for a given custom resource. Also provided is an implementation for such a handler, that allows pausing reconciliation via a custom annotation that must be added to the CR. If this annotation is set to true then the operator does not reconcile the CR.

Co-authored-by: Marcin Owsiany <porridge@redhat.com>
Comment threadpkg/reconciler/reconciler.go Outdated
Comment threadpkg/reconciler/reconciler.go Outdated
@vladbologavladbologa changed the title ROX-28223: Pause-reconcile annotationROX-28223: Pause-reconcile handlerMar 3, 2025
Comment threadpkg/reconciler/reconciler.go Outdated
Comment threadpkg/reconciler/reconciler.go Outdated
Comment threadpkg/reconciler/reconciler.go Outdated

@perdasilvaperdasilva 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.

lgmt ^^ thank you!!

Signed-off-by: Per Goncalves da Silva <pegoncal@redhat.com>
@perdasilva

Copy link
Copy Markdown
Contributor

@vladbologa I've taken the liberty of fixing up the lint complaints - I hope that's ok. If it's green, I'll merge.

@codecov-commenter

codecov-commenter commented Mar 13, 2025

Copy link
Copy Markdown

Codecov Report

❌ Patch coverage is 84.37500% with 5 lines in your changes missing coverage. Please review.
✅ Project coverage is 78.47%. Comparing base (08ab7fb) to head (195e0cb).
⚠️ Report is 139 commits behind head on main.

Files with missing linesPatch %Lines
pkg/reconciler/reconciler.go90.00%2 Missing and 1 partial ⚠️
pkg/reconciler/internal/conditions/conditions.go0.00%2 Missing ⚠️

❗ There is a different number of reports uploaded between BASE (08ab7fb) and HEAD (195e0cb). Click for more details.

HEAD has 1 upload less than BASE
FlagBASE (08ab7fb)HEAD (195e0cb)
21
Additional details and impacted files
@@ Coverage Diff @@## main #426 +/- ##
==========================================
- Coverage 85.06% 78.47% -6.60% 
==========================================
Files 19 31 +12 Lines 1346 2518 +1172 ==========================================
+ Hits 1145 1976 +831 - Misses 125 451 +326 - Partials 76 91 +15 

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@perdasilva
perdasilva added this pull request to the merge queueMar 13, 2025
Merged via the queue into operator-framework:main with commit 21768c8Mar 13, 2025
Sign up for freeto 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.

5 participants

@vladbologa@perdasilva@codecov-commenter@porridge@joelanford