Skip to content

🐛 OPRUN-4266: Restore last-applied-config annotation in cache - #2338

Merged
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
tmshort:restore-last-applied-config
Nov 17, 2025
Merged

🐛 OPRUN-4266: Restore last-applied-config annotation in cache#2338
openshift-merge-bot[bot] merged 1 commit into
operator-framework:mainfrom
tmshort:restore-last-applied-config

Conversation

@tmshort

@tmshorttmshort commented Nov 17, 2025

Copy link
Copy Markdown
Contributor

This restores the last-applied-config annotation in the cache, as its absense can cause issues with clients when we update our finalizers.

This increases memory utilization until we can solve the finalizer issue.

This removes optimizations from #2290, and is an alternative to #2328.

If #2328 can updated to work (possibly w/o SSA), then this would be reverted to restore the memory savings.

Description

Reviewer Checklist

  • API Go Documentation
  • Tests: Unit Tests (and E2E Tests, if appropriate)
  • Comprehensive Commit Messages
  • Links to related GitHub Issue(s)

@tmshort
tmshort requested a review from a team as a code ownerNovember 17, 2025 14:58
@netlify

netlifyBot commented Nov 17, 2025

Copy link
Copy Markdown

Deploy Preview for olmv1 ready!

NameLink
🔨 Latest commitcdaadc5
🔍 Latest deploy loghttps://app.netlify.com/projects/olmv1/deploys/691b3e5694c0c10008658d7e
😎 Deploy Previewhttps://deploy-preview-2338--olmv1.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify project configuration.

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

We are just reverting.
Ok. That is fine 👍

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Nov 17, 2025
@camilamacedo86

Copy link
Copy Markdown
Contributor

/lgtm cancel

Seems that is more than a revert.
I misunderstood that
And is not passing in unit test

@openshift-ciopenshift-ciBot removed the lgtm Indicates that a PR is ready to be merged. label Nov 17, 2025
This restores the last-applied-config annotation in the cache, as its
absense can cause issues with clients when we update our finalizers.
This increases memory utilization until we can solve the finalizer issue.
Signed-off-by: Todd Short <tshort@redhat.com>
@tmshort
tmshortforce-pushed the restore-last-applied-config branch from e3dbec6 to cdaadc5CompareNovember 17, 2025 15:25
@codecov

codecovBot commented Nov 17, 2025

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 74.27%. Comparing base (c06f27f) to head (cdaadc5).
⚠️ Report is 6 commits behind head on main.

Additional details and impacted files
@@ Coverage Diff @@## main #2338 +/- ##
==========================================
- Coverage 74.30% 74.27% -0.03% 
==========================================
Files 91 91 Lines 7083 7196 +113 ==========================================
+ Hits 5263 5345 +82 - Misses 1405 1426 +21 - Partials 415 425 +10 
FlagCoverage Δ
e2e44.64% <ø> (-1.01%)⬇️
experimental-e2e48.54% <ø> (+0.14%)⬆️
unit58.46% <ø> (-0.15%)⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

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

@tmshort

Copy link
Copy Markdown
ContributorAuthor

@camilamacedo86 it is now just the revert, and it passing unit tests.

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

/lgtm

@openshift-ciopenshift-ciBot added the lgtm Indicates that a PR is ready to be merged. label Nov 17, 2025
@tmshorttmshort changed the title 🐛 Restore last-applied-config annotation in cache🐛 OPRUN-4266: Restore last-applied-config annotation in cacheNov 17, 2025
@tmshort

Copy link
Copy Markdown
ContributorAuthor

Two other's LGTM'd
/approve

@openshift-ci

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ankitathomas, camilamacedo86, tmshort

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ciopenshift-ciBot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 17, 2025
@openshift-merge-bot
openshift-merge-botBot merged commit 39cbdbe into operator-framework:mainNov 17, 2025
27 checks passed
@tmshort
tmshort deleted the restore-last-applied-config branch November 18, 2025 18:23
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 18, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 19, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 19, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 24, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 25, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Nov 26, 2025
tmshort added a commit to tmshort/operator-controller that referenced this pull request Dec 1, 2025
openshift-merge-botBot pushed a commit that referenced this pull request Dec 2, 2025
* Use Patch instead of Update for finalizer operations
Refactor all controllers to use Patch() instead of Update()
when adding or removing finalizers to improve performance, and to avoid
removing non-cached fields erroneously.
This is necesary because we no longer cache the last-applied-configuration
annotation, so when we add/remove the finalizers, we are removing that field
from the metadata. This causes issues with clients when they don't see that
annotation (e.g. apply the same ClusterExtension twice).
Update ClusterCatalog and ClusterExtension controllers to use Patch-based
funalizer management (ClusterExtensionRevision already uses Patch())
Signed-off-by: Todd Short <tshort@redhat.com>
* Revert "Restore last-applied-config annotation in cache (#2338)"
This reverts commit 39cbdbe.
---------
Signed-off-by: Todd Short <tshort@redhat.com>
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approvedIndicates a PR has been approved by an approver from all required OWNERS files.lgtmIndicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants

@tmshort@camilamacedo86@ankitathomas