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 datasource json and secure json fields #40

Merged
merged 2 commits into from
Aug 28, 2019
Merged

fix datasource json and secure json fields #40

merged 2 commits into from
Aug 28, 2019

Conversation

pb82
Copy link
Collaborator

@pb82 pb82 commented Aug 28, 2019

Fixes #38

The problem was that grafana uses a type of map[string]interface{} for the jsonData and secureJsonData fields of a data source. The operator-sdk does not support code generation for interface{} fields. Instead of only allowing strings we're now providing structs for the most common jsonData and secureJsonData options as documented here.

Verification steps:

  1. Install the operator using the quay.io/integreatly/grafana-operator:fix-extra-json tag.
  2. Create the example data source.
  3. The operator will restart grafana.
  4. After a few seconds, log in to Grafana and check the data sources.
  5. The Prometheus data source should exist and the tlsSkipVerify option should be checked.

@pb82 pb82 requested a review from jjaferson August 28, 2019 11:19
@pb82 pb82 merged commit 383f7c0 into master Aug 28, 2019
@pb82 pb82 deleted the fix-extra-json branch August 28, 2019 16:16
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.

Cannot add JsonData to datasource
2 participants