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.

Sign up for GitHub

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

Jump to bottom

chore: Update GrafanaContactPoint reconcile loop #1814

Merged
merged 4 commits into from
Jan 14, 2025
Merged

chore: Update GrafanaContactPoint reconcile loop #1814

merged 4 commits into from
Jan 14, 2025

Conversation

Baarsgaard
Copy link
Contributor

@Baarsgaard Baarsgaard commented Jan 9, 2025 •
edited
Loading

  • fix: Warnings when returning ctrl.Result and an error and logging errors twice.
  • fix: status subresource updates are now ignored
  • feat: status.lastResync is now updated and registered as a printed column (for GrafanaFolder and GrafanaNotificationTemplate as well)
    It was not clear to me if Age should be added as well

@Baarsgaard Baarsgaard changed the title fix: Update contactpoint reconcile loop chore: Update contactpoint reconcile loop Jan 9, 2025
@Baarsgaard Baarsgaard changed the title chore: Update contactpoint reconcile loop chore: Update GrafanaContactPoint reconcile loop Jan 9, 2025
@Baarsgaard Baarsgaard marked this pull request as ready for review January 9, 2025 19:08
@Baarsgaard Baarsgaard force-pushed the update_contactpoint_reconcile_loop branch from d50099e to e46340f Compare January 10, 2025 00:58
@Baarsgaard Baarsgaard mentioned this pull request Jan 10, 2025
Merged
theSuess
theSuess requested changes Jan 13, 2025
View reviewed changes
Copy link
Member

@theSuess theSuess left a comment

Choose a reason for hiding this comment

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

Looks good to me with one minor nitpick.

Also blocking this until we have a decision on the finalization logic

controllers/grafanacontactpoint_controller.go Show resolved Hide resolved
controllers/grafanacontactpoint_controller.go Outdated Show resolved Hide resolved
@Baarsgaard Baarsgaard force-pushed the update_contactpoint_reconcile_loop branch from e46340f to 7509254 Compare January 13, 2025 18:39
@theSuess theSuess enabled auto-merge January 14, 2025 13:13
@theSuess theSuess added this pull request to the merge queue Jan 14, 2025
Merged via the queue into grafana:master with commit 01a97ac Jan 14, 2025
14 checks passed
@Baarsgaard Baarsgaard deleted the update_contactpoint_reconcile_loop branch January 14, 2025 17:26
@theSuess theSuess added the refactor this PR refactors code without introducing functionality label Jan 15, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@theSuess theSuess theSuess approved these changes

@NissesSenap NissesSenap Awaiting requested review from NissesSenap NissesSenap is a code owner

@weisdd weisdd Awaiting requested review from weisdd weisdd is a code owner

@ishanjainn ishanjainn Awaiting requested review from ishanjainn ishanjainn is a code owner

@hubeadmin hubeadmin Awaiting requested review from hubeadmin hubeadmin is a code owner

@pb82 pb82 Awaiting requested review from pb82 pb82 is a code owner

Assignees
No one assigned
Labels
refactor this PR refactors code without introducing functionality
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@Baarsgaard @theSuess