fix(GrafanaFolder): proper status updates for removed CRs, don't fail on missing folder in onFolderDeleted events #1516
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.
Two fixes for
grafanafolder
controller:onFolderDeleted
would treat a missing folder (e.g. deleted through Grafana UI) as an error, which should have never been the case. - We just overlooked a missing!
in error handling logic;syncFolders
was supposed to check if a folder still exists in Grafana, but instead of using method for folders, it used one for dashboards.Two manual test cases to verify the fix:
onFolderDeleted
:GrafanaFolder
CR (e.g. fromexamples/folder
);Grafana
CR should contain a reference to the folder instatus.folders
;Grafana
CR should no longer contain a reference to the folder instatus.folders
;syncFolders
:GrafanaFolder
CR (e.g. fromexamples/folder
);Grafana
CR should contain a reference to the folder instatus.folders
;kubectl scale deployment grafana-operator-controller-manager-v5 --replicas 0
);GrafanaFolder
CR;kubectl scale deployment grafana-operator-controller-manager-v5 --replicas 1
);Grafana
CR should no longer contain a reference to the folder instatus.folders
.Fixes: #1512