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: use correct folder uid to update permissions #1602

Merged

Conversation

timp87
Copy link
Contributor

@timp87 timp87 commented Jul 3, 2024

Currently grafanafolder controller tries to update folder permission using CR UID no matter if the folder was created by dashboard controller earlier.

@CLAassistant
Copy link

CLAassistant commented Jul 3, 2024

CLA assistant check
All committers have signed the CLA.

@theSuess
Copy link
Member

theSuess commented Jul 4, 2024

Good catch! I'll merge this in after #1600 with some minor adjustments

@theSuess theSuess force-pushed the fix-grafanafolder-permission-reconciliation branch from 541d03f to 9855012 Compare July 4, 2024 07:23
@theSuess
Copy link
Member

theSuess commented Jul 4, 2024

Moved the reassignment of the uid in the existing conditional to prevent adding another conditional & to use the correct uid in case we are using a preexisting folder

@theSuess theSuess enabled auto-merge July 4, 2024 07:48
@theSuess theSuess added this pull request to the merge queue Jul 4, 2024
Merged via the queue into grafana:master with commit 65c8137 Jul 4, 2024
13 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants