Add support for arbitrary [Secure]JsonData

[meln5674]

Description

• Added customJsonData and customSecureJsonData fields to GrafanaDashboard.spec.datasources[*]
• Added example manifests with a non-standard plugin datasource

Note: Requires updating controller-gen to v0.6.2

Relevant issues/tickets

Fixes #708

Type of change

• Bug fix (non-breaking change which fixes an issue)
• New feature (non-breaking change which adds functionality)
• Breaking change (fix or feature that would cause existing functionality to not work as expected)

Checklist

• This change requires a documentation update
• I have added tests that prove my fix is effective or that my feature works
• I have added a test case that will be used to verify my changes
• Verified independently on a cluster by reviewer

Verification steps

1. Run

kubectl apply -f deploy/examples/GrafanaWithPlugin.yaml deploy/examples/datasources/Custom.yaml
kubectl get -o yaml configmap grafana-datasources
kubectl port-forward svc/grafana-service 3000:3000

2. Confirm data source correctly created at http://localhost:3000/datasources in browser

[NissesSenap]

This would also solve #788

[pb82]

@meln5674 I like the idea of using json.RawMessage. Does this work as an in place update or will there be conflicts with existing CRs?

EDIT: nvm. I see that you are adding fields, not replacing existing ones. So no conflict here.

[NissesSenap]

@pb82 have you had time to look in to this?

[pb82]

Verified with the Prometheus data source. Had some issues with the provided Druid example. Is there another plugin needed for this data source?

[pb82]

thanks @meln5674 !

[owenhaynes]

Could we get a release made with this in please?

[NissesSenap]

I will do it Thursday next week unless someone else prepareras the release.

[meln5674]

In-place. The change will check if the custom fields are set and overwrite the existing fields if so. Otherwise, the behavior should be unchanged.

…

On Tue, Jul 26, 2022, 05:45 Peter Braun ***@***.***> wrote: @meln5674 <https://github.com/meln5674> I like the idea of using json.RawMessage. Does this work as an in place update or will there be conflicts with existing CRs? — Reply to this email directly, view it on GitHub <#803 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AFRKGN5AXWFPYORHM2PTQETVV7FWVANCNFSM54UFWIOA> . You are receiving this because you were mentioned.Message ID: ***@***.***>