monitoring: update label on prometheus resources #9243
Merged
Conversation
This file contains 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
Updating the promethes reources (PrometheusRule and ServiceMonitor) is done by fetching the current resource from the server and updating the spec on it. This commit makes it also apply the labels, so users can update them via rook CRDs. Closes: rook#9241 Signed-off-by: Mara Sophie Grosch <littlefox@lf-net.org>
travisn
reviewed
Nov 24, 2021
| @@ -80,6 +80,7 @@ func CreateOrUpdateServiceMonitor(serviceMonitorDefinition *monitoringv1.Service | |||
| return nil, fmt.Errorf("failed to retrieve servicemonitor. %v", err) | |||
| } | |||
| oldSm.Spec = serviceMonitorDefinition.Spec | |||
| oldSm.ObjectMeta.Labels = serviceMonitorDefinition.ObjectMeta.Labels | |||
There was a problem hiding this comment.
Do we need to do the same for annotations?
There was a problem hiding this comment.
I actually had that in there at first, but iirc there is currently no way to set annotations on these resources via rook CRDs and the templates do not contain any, too - so I removed that, for not cluttering code with seemingly unneeded things.
There was a problem hiding this comment.
I see, we should probably add the annotations in a future PR, but looks good for now!
travisn
approved these changes
Nov 24, 2021
| @@ -80,6 +80,7 @@ func CreateOrUpdateServiceMonitor(serviceMonitorDefinition *monitoringv1.Service | |||
| return nil, fmt.Errorf("failed to retrieve servicemonitor. %v", err) | |||
| } | |||
| oldSm.Spec = serviceMonitorDefinition.Spec | |||
| oldSm.ObjectMeta.Labels = serviceMonitorDefinition.ObjectMeta.Labels | |||
There was a problem hiding this comment.
I see, we should probably add the annotations in a future PR, but looks good for now!
mergify bot
added a commit
that referenced
this pull request
Nov 24, 2021
monitoring: update label on prometheus resources (backport #9243)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 of your changes:
Updating the promethes resources (PrometheusRule and ServiceMonitor) is
done by fetching the current resource from the server and updating the
spec on it. This commit makes it also apply the labels, so users can
update them via rook CRDs.
Which issue is resolved by this Pull Request:
Resolves #9241
Checklist:
make codegen) has been run to update object specifications, if necessary.