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

bugfix - datasource controller was dropping secureJsonData #1500

Merged
merged 1 commit into from
Apr 19, 2024

Conversation

NissesSenap
Copy link
Collaborator

@NissesSenap NissesSenap commented Apr 19, 2024

This addresses a bug introduced in the changeover to using the openapi Grafana library where the secureJsonData field was being dropped.

To address this it's necessary to use the UpdateDataSourceCommand struct to ensure we're also not dropping the version if it's present.

This is a bit counter-intuitive to use the Update struct here and perhaps worth looking at another solution at some point.

Thanks to @mdelaney committed for the initial PR #1488

This addresses a bug introduced in the changeover to using the openapi
Grafana library where the secureJsonData field was being dropped.

To address this it's necessary to use the `UpdateDataSourceCommand`
struct to ensure we're also not dropping the version if it's present.

This is a bit counter-intuitive to use the `Update` struct here and
perhaps worth looking at another solution at some point.

Thanks to matt-delaney-cruise for the initial PR around this.
@NissesSenap NissesSenap merged commit ea03cf4 into grafana:master Apr 19, 2024
10 checks passed
@NissesSenap NissesSenap deleted the fix_datasource_secretJson branch April 19, 2024 07:20
@dj-wasabi
Copy link

Out of curiosity (and thus no means for pressure 😉), when can we expect a new release containing this fix? I can then determine to either wait or to rollback to a previous version.

@weisdd
Copy link
Collaborator

weisdd commented Apr 24, 2024

@dj-wasabi most likely, we'll cut a release tomorrow.

@schmitz-chris
Copy link

I worked with the operator for the first time today and spent two hours desperately trying to add values. :) I'm already looking forward to the new release

@Skoucail
Copy link

Skoucail commented Apr 26, 2024

Happy i found this issue/pr pretty quick, first time using the operator and didn't get passwords to work for my datasources.
Used version 5.8.0 for the moment but looking forward to the release.

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.

6 participants