Remove invaldBindings from smon status#7836
Merged
simonpasquier merged 7 commits intoprometheus-operator:mainfrom Aug 27, 2025
Merged
Remove invaldBindings from smon status#7836simonpasquier merged 7 commits intoprometheus-operator:mainfrom
simonpasquier merged 7 commits intoprometheus-operator:mainfrom
Conversation
Contributor
Author
|
@simonpasquier PTAL |
…onitorBinding function
…igResWorkloadBindingCleanup functions for improved workload binding management
Contributor
Author
|
@simonpasquier review and merge requests |
pkg/prometheus/operator.go
Outdated
| return err | ||
| } | ||
|
|
||
| // RemoveStatus remove the Prometheus or PrometheusAgent binding from the status |
Contributor
There was a problem hiding this comment.
(nit)
Suggested change
| // RemoveStatus remove the Prometheus or PrometheusAgent binding from the status | |
| // RemoveServiceMonitorBinding removes the Prometheus or PrometheusAgent binding from the status |
test/e2e/status_subresource_test.go
Outdated
| require.NoError(t, err) | ||
| } | ||
|
|
||
| // testInvalidBindingCleanupFromSmonStatus validates ServiceMonitor status removes Prometheus refrence when the selectors are changed. |
Contributor
There was a problem hiding this comment.
Suggested change
| // testInvalidBindingCleanupFromSmonStatus validates ServiceMonitor status removes Prometheus refrence when the selectors are changed. | |
| // testInvalidBindingCleanupFromSmonStatus validates that the operator removes the reference to the Prometheus resource when the ServiceMonitor isn't selected anymore by the workload. |
test/e2e/status_subresource_test.go
Outdated
| } | ||
|
|
||
| // testInvalidBindingCleanupFromSmonStatus validates ServiceMonitor status removes Prometheus refrence when the selectors are changed. | ||
| func testInvalidBindingCleanupFromSmonStatus(t *testing.T) { |
Contributor
There was a problem hiding this comment.
(nit)
Suggested change
| func testInvalidBindingCleanupFromSmonStatus(t *testing.T) { | |
| func testGarbageCollectionOfServiceMonitorBinding(t *testing.T) { |
…Monitor binding management
Contributor
Author
|
@simonpasquier done the changes |
| return true | ||
| } | ||
|
|
||
| // RemoveServiceMonitorBinding removes the Prometheus or PrometheusAgent binding from the status remove the Prometheus or PrometheusAgent binding from the status |
Contributor
Author
There was a problem hiding this comment.
The function is only present at once !!
Contributor
There was a problem hiding this comment.
Sorry for being dense, I meant that the comment stutters.
simonpasquier
approved these changes
Aug 27, 2025
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
2 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
Remove invaldBindings from smon status
Closes: #7834
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.