fix: use update instead of patch#8029
Merged
simonpasquier merged 1 commit intoprometheus-operator:mainfrom Oct 15, 2025
Merged
Conversation
On first reconciliation of the status subresource, the patch semantics don't allow to ensure that a second concurrent patch operation doesn't overwrite the first change. Using Update with ResourceVersion (aka optimistic locking), we make sure that the second operation would fail (and be retried). Signed-off-by: Simon Pasquier <spasquie@redhat.com>
3c184bd to
abc8f76
Compare
5 tasks
yp969803
approved these changes
Oct 14, 2025
slashpai
approved these changes
Oct 15, 2025
aa8a932
into
prometheus-operator:main
28 of 30 checks passed
5 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
On first reconciliation of the status subresource, the patch semantics don't allow to ensure that a second concurrent patch operation doesn't overwrite the first change. Using Update with ResourceVersion (aka optimistic locking), we make sure that the second operation would fail (and be retried).
Closes: #8028
Type of change
What type of changes does your code introduce to the Prometheus operator? Put an
xin the box that apply.CHANGE(fix or feature that would cause existing functionality to not work as expected)FEATURE(non-breaking change which adds functionality)BUGFIX(non-breaking change which fixes an issue)ENHANCEMENT(non-breaking change which improves existing functionality)NONE(if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)Verification
Please check the Prometheus-Operator testing guidelines for recommendations about automated tests.
Changelog entry
Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.