fix(operator): Remove duplicate conditions from status - #13497
Merged
Conversation
JoaoBraveCoding
approved these changes
Jul 12, 2024
JoaoBraveCoding
left a comment
JoaoBraveCoding
left a comment
Collaborator
There was a problem hiding this comment.
Neat 👌 I left just a small "nit" feel free to ignore
| c.LastTransitionTime = now | ||
|
|
||
| merged = append(merged, c) | ||
| conditions[conditionKey{Type: c.Type, Reason: c.Reason}] = true |
Collaborator
There was a problem hiding this comment.
nit: just to match the usage below
Suggested change
| conditions[conditionKey{Type: c.Type, Reason: c.Reason}] = true | |
| conditions[conditionKey{c.Type, c.Reason}] = true |
periklis
approved these changes
Jul 12, 2024
This was referenced Aug 15, 2024
This was referenced Oct 14, 2024
This was referenced Oct 21, 2024
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.
What this PR does / why we need it:
Some of the code in the operator (for example the metrics) work on the assumption that every combination of "Type" and "Reason" in the Conditions in the LokiStack
.status.conditionsis only present once. The current implementation of the status update function tries to keep this assumption valid, but does not remove duplicate conditions if they already exists (for example, from a previous version of the operator which did not have this assumption yet).This PR extends the
mergeConditionfunction that merges the existing Conditions with the currently active ones, so that it removes duplicate conditions (as defined by having the same combination of "Type & Reason"). In addition it also now keeps thelastTransitionTimetimestamp untouched when the condition is not part of the "active conditions" and has not been set to "inactive" in this update. This makes it possible to see if conditions have been inactive for a longer time and should improve debugging of LokiStack resources.Which issue(s) this PR fixes:
Fixes LOG-5696
Special notes for your reviewer:
Checklist
CONTRIBUTING.mdguide (required)