Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(operator): Remove duplicate conditions from status #13497

Merged
merged 1 commit into from
Jul 12, 2024

Conversation

xperimental
Copy link
Collaborator

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.conditions is 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 mergeCondition function 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 the lastTransitionTime timestamp 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

  • Reviewed the CONTRIBUTING.md guide (required)
  • Tests updated
  • Title matches the required conventional commits format, see here

@xperimental xperimental self-assigned this Jul 11, 2024
@xperimental xperimental requested review from periklis and a team as code owners July 11, 2024 17:00
Copy link
Collaborator

@JoaoBraveCoding JoaoBraveCoding left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Neat 👌 I left just a small "nit" feel free to ignore

image

c.LastTransitionTime = now

merged = append(merged, c)
conditions[conditionKey{Type: c.Type, Reason: c.Reason}] = true
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants