From fb8ed04ec9010d7e8ba6f6a6b16c9b67c323e3e7 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Sat, 18 Sep 2021 13:37:33 +0200 Subject: [PATCH] Fix csv 4.0 (#522) * fix: spec.client is not working * update auto generated code * feat: crd migration working as expected * remove required field --- api/integreatly/v1alpha1/grafana_types.go | 11 +- .../v1alpha1/zz_generated.deepcopy.go | 5 + ...rafana-operator.clusterserviceversion.yaml | 558 ++++++++---------- .../integreatly.org_grafanadatasources.yaml | 8 + .../manifests/integreatly.org_grafanas.yaml | 66 +++ .../crd/bases/integreatly.org_grafanas.yaml | 2 - controllers/grafana/grafana_controller.go | 5 +- controllers/grafana/grafana_reconciler.go | 4 +- deploy/examples/Grafana.yaml | 2 + 9 files changed, 353 insertions(+), 308 deletions(-) diff --git a/api/integreatly/v1alpha1/grafana_types.go b/api/integreatly/v1alpha1/grafana_types.go index 97a2a8037..73e9bbcdd 100644 --- a/api/integreatly/v1alpha1/grafana_types.go +++ b/api/integreatly/v1alpha1/grafana_types.go @@ -61,8 +61,8 @@ type JsonnetConfig struct { // Grafana API client settings type GrafanaClient struct { - TimeoutSeconds *int `json:"timeout,omitempty"` - PreferService bool `json:"preferService"` + TimeoutSeconds *int `json:"timeout,omitempty"` + PreferService *bool `json:"preferService,omitempty"` } // GrafanaService provides a means to configure the service @@ -571,3 +571,10 @@ type GrafanaList struct { func init() { SchemeBuilder.Register(&Grafana{}, &GrafanaList{}) } + +func (cr *Grafana) GetPreferServiceValue() bool { + if cr.Spec.Client != nil && cr.Spec.Client.PreferService != nil { + return *cr.Spec.Client.PreferService + } + return false +} diff --git a/api/integreatly/v1alpha1/zz_generated.deepcopy.go b/api/integreatly/v1alpha1/zz_generated.deepcopy.go index e4a81b9d7..1d6f1e0af 100644 --- a/api/integreatly/v1alpha1/zz_generated.deepcopy.go +++ b/api/integreatly/v1alpha1/zz_generated.deepcopy.go @@ -62,6 +62,11 @@ func (in *GrafanaClient) DeepCopyInto(out *GrafanaClient) { *out = new(int) **out = **in } + if in.PreferService != nil { + in, out := &in.PreferService, &out.PreferService + *out = new(bool) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new GrafanaClient. diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml index 31a338842..01238d824 100644 --- a/bundle/manifests/grafana-operator.clusterserviceversion.yaml +++ b/bundle/manifests/grafana-operator.clusterserviceversion.yaml @@ -2,63 +2,25 @@ apiVersion: operators.coreos.com/v1alpha1 kind: ClusterServiceVersion metadata: annotations: - alm-examples: "[\n{\n \"apiVersion\": \"integreatly.org/v1alpha1\",\n \"kind\"\ - : \"Grafana\",\n \"metadata\": {\n \"name\": \"example-grafana\"\n },\n\ - \ \"spec\": {\n \"ingress\": {\n \"enabled\": true\n },\n \"\ - config\": {\n \"auth\": {\n \"disable_signout_menu\": true\n \ - \ },\n \"auth.anonymous\": {\n \"enabled\": true\n },\n \ - \ \"log\": {\n \"level\": \"warn\",\n \"mode\": \"console\"\ - \n },\n \"security\": {\n \"admin_password\": \"secret\",\n\ - \ \"admin_user\": \"root\"\n }\n },\n \"dashboardLabelSelector\"\ - : [\n {\n \"matchExpressions\": [\n {\n \"key\": \"app\"\ - ,\n \"operator\": \"In\",\n \"values\": [\n \"grafana\"\ - \n ]\n }\n ]\n }\n ]\n }\n},\n{\n \"apiVersion\": \"\ - integreatly.org/v1alpha1\",\n \"kind\": \"GrafanaDashboard\",\n \"metadata\"\ - : {\n \"labels\": {\n \"app\": \"grafana\"\n },\n \"name\": \"\ - simple-dashboard\"\n },\n \"spec\": {\n \"json\": \"{\\n \\\"id\\\": null,\\\ - n \\\"title\\\": \\\"Simple Dashboard\\\",\\n \\\"tags\\\": [],\\n \\\"style\\\ - \": \\\"dark\\\",\\n \\\"timezone\\\": \\\"browser\\\",\\n \\\"editable\\\"\ - : true,\\n \\\"hideControls\\\": false,\\n \\\"graphTooltip\\\": 1,\\n \\\ - \"panels\\\": [],\\n \\\"time\\\": {\\n \\\"from\\\": \\\"now-6h\\\",\\\ - n \\\"to\\\": \\\"now\\\"\\n },\\n \\\"timepicker\\\": {\\n \\\"time_options\\\ - \": [],\\n \\\"refresh_intervals\\\": []\\n },\\n \\\"templating\\\": {\\\ - n \\\"list\\\": []\\n },\\n \\\"annotations\\\": {\\n \\\"list\\\":\ - \ []\\n },\\n \\\"refresh\\\": \\\"5s\\\",\\n \\\"schemaVersion\\\": 17,\\\ - n \\\"version\\\": 0,\\n \\\"links\\\": []\\n}\\n\",\n \"name\": \"simple-dashboard.json\"\ - \n }\n},\n{\n \"apiVersion\": \"integreatly.org/v1alpha1\",\n \"kind\": \"\ - GrafanaDataSource\",\n \"metadata\": {\n \"name\": \"example-grafanadatasource\"\ - \n },\n \"spec\": {\n \"datasources\": [\n {\n \"access\": \"proxy\"\ - ,\n \"editable\": true,\n \"isDefault\": true,\n \"jsonData\"\ - : {\n \"timeInterval\": \"5s\"\n },\n \"name\": \"Prometheus\"\ - ,\n \"type\": \"prometheus\",\n \"url\": \"http://prometheus-service:9090\"\ - ,\n \"version\": 1\n }\n ],\n \"name\": \"example-datasources.yaml\"\ - \n }\n}\n]" + alm-examples: '[]' capabilities: Basic Install operators.operatorframework.io/builder: operator-sdk-v1.3.2 operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 - categories: Monitoring - certified: 'False' - containerImage: quay.io/grafana-operator/grafana-operator:v4.0.0 - createdAt: 2020-08-23 00:00:00 - description: An Operator for managing Grafana instances, dashboards and data sources - repository: https://github.com/integr8ly/grafana-operator - support: Red Hat - olm.properties: '[{"type": "olm.maxOpenShiftVersion", "value": "4.8"}]' name: grafana-operator.v4.0.0 namespace: placeholder spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - kind: GrafanaDashboard - name: grafanadashboards.integreatly.org - version: v1alpha1 - - kind: GrafanaDataSource - name: grafanadatasources.integreatly.org - version: v1alpha1 - - kind: Grafana - name: grafanas.integreatly.org - version: v1alpha1 + - kind: GrafanaDashboard + name: grafanadashboards.integreatly.org + version: v1alpha1 + - kind: GrafanaDataSource + name: grafanadatasources.integreatly.org + version: v1alpha1 + - kind: Grafana + name: grafanas.integreatly.org + version: v1alpha1 description: | A Kubernetes Operator based on the Operator SDK for creating and managing Grafana instances. @@ -75,267 +37,267 @@ spec: * Install Plugins (panels) displayName: Grafana Operator icon: - - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
   y="0px"
   width="57.799999"
   height="57.799999"
   viewBox="0 0 57.799999 57.8"
   xml:space="preserve"
   sodipodi:docname="logo_small.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
   id="metadata3785"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs3783" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="2560"
   inkscape:window-height="1386"
   id="namedview3781"
   showgrid="false"
   inkscape:zoom="13.858714"
   inkscape:cx="75.412904"
   inkscape:cy="23.077606"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style3769">
	.st0{fill:#E6E7E8;}
	.st1{fill:url(#SVGID_1_);}
</style>

<linearGradient
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   x1="26.700001"
   y1="-9.8501997"
   x2="26.700001"
   y2="43.166"
   gradientTransform="matrix(1,0,0,-1,2,60.000002)">
	<stop
   offset="0"
   style="stop-color:#FFF100"
   id="stop3773" />
	<stop
   offset="1"
   style="stop-color:#F05A28"
   id="stop3775" />
</linearGradient>
<path
   class="st1"
   d="m 55.1,25.500002 c -0.1,-1 -0.3,-2.1 -0.6,-3.3 -0.3,-1.2 -0.8,-2.6 -1.5,-4 -0.7,-1.4 -1.6,-2.9 -2.8,-4.3 -0.5,-0.6 -1,-1.1 -1.5,-1.6 0.8,-3.2000004 -1,-6.0000004 -1,-6.0000004 -3.1,-0.2 -5.1,1 -5.8,1.5 -0.1,-0.1 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -1,-0.4 -1.6,-0.6 -0.6,-0.2 -1.1,-0.3 -1.7,-0.5 -0.6,-0.1 -1.2,-0.3 -1.8,-0.3 -0.1,0 -0.2,0 -0.3,0 C 34.8,1.8000016 30.9,1.5258789e-6 30.9,1.5258789e-6 26.6,2.8000016 25.7,6.6000016 25.7,6.6000016 c 0,0 0,0.1 0,0.2 -0.2,0.1 -0.5,0.1 -0.7,0.2 -0.3,0.1 -0.7,0.2 -1,0.3 -0.3,0.1 -0.7,0.3 -1,0.4 -0.7,0.3 -1.3,0.6 -1.9,1 -0.6,0.3 -1.2,0.7 -1.8,1.1 -0.1,0 -0.2,-0.1 -0.2,-0.1 -6,-2.3 -11.4,0.5000004 -11.4,0.5000004 -0.5,6.4 2.4,10.4 3,11.2 -0.1,0.4 -0.3,0.8 -0.4,1.2 -0.4,1.4 -0.8,2.9 -1,4.5 0,0.2 -0.1,0.4 -0.1,0.7 -5.6,2.7 -7.2,8.4 -7.2,8.4 4.6,5.3 10,5.7 10,5.7 v 0 c 0.7,1.2 1.5,2.4 2.4,3.5 0.4,0.5 0.8,0.9 1.2,1.3 -1.7,4.8 0.2,8.9 0.2,8.9 5.2,0.2 8.6,-2.3 9.3,-2.8 0.5,0.2 1,0.3 1.6,0.5 1.6,0.4 3.2,0.6 4.8,0.7 0.4,0 0.8,0 1.2,0 h 0.2 0.1 0.3 0.3 v 0 c 2.4,3.5 6.7,4 6.7,4 3.4,-3.6 3.2,-7.2 3.2,-7.2 l -0.1,-0.1 c 0.7,-0.5 1.3,-1 1.9,-1.5 1.2,-1.1 2.3,-2.4 3.2,-3.7 0.1,-0.1 0.2,-0.3 0.2,-0.4 3.4,0.2 5.9,-2.1 5.9,-2.1 -0.6,-4 -3.1,-5.7 -3.1,-5.7 h -0.1 c 0,-0.2 0,-0.5 0.1,-0.7 0,-0.4 0,-0.8 0,-1.2 v -0.3 -0.1 -0.1 c 0,-0.1 0,-0.1 0,-0.1 v -0.2 -0.3 c 0,-0.1 0,-0.2 0,-0.3 0,-0.1 0,-0.2 0,-0.3 v -0.3 -0.3 c -0.1,-0.4 -0.1,-0.8 -0.2,-1.2 -0.4,-1.5 -1,-3 -1.8,-4.3 -0.8,-1.3 -1.8,-2.5 -2.9,-3.5 -1.1,-1 -2.4,-1.8 -3.7,-2.4 -1.3,-0.6 -2.7,-1 -4.1,-1.1 -0.7,-0.1 -1.4,-0.1 -2,-0.1 h -0.3 -0.1 -0.1 -0.1 -0.3 c -0.1,0 -0.2,0 -0.3,0 -0.3,0 -0.7,0.1 -1,0.1 -1.4,0.3 -2.7,0.7 -3.8,1.4 -1.1,0.7 -2.1,1.5 -2.9,2.5 -0.8,1 -1.4,2 -1.9,3.1 -0.4,1.1 -0.7,2.2 -0.7,3.3 0,0.3 0,0.6 0,0.8 0,0.1 0,0.1 0,0.2 v 0.2 c 0,0.1 0,0.3 0,0.4 0.1,0.6 0.2,1.1 0.3,1.6 0.3,1 0.8,2 1.4,2.8 0.6,0.8 1.3,1.5 2.1,2 0.8,0.5 1.6,0.9 2.4,1.1 0.8,0.2 1.6,0.3 2.3,0.3 0.1,0 0.2,0 0.3,0 h 0.1 0.1 c 0.1,0 0.2,0 0.2,0 0,0 0,0 0.1,0 h 0.1 0.1 c 0.1,0 0.2,0 0.3,0 0.1,0 0.2,0 0.3,-0.1 0.2,0 0.3,-0.1 0.5,-0.1 0.3,-0.1 0.6,-0.2 0.9,-0.4 0.3,-0.1 0.5,-0.3 0.8,-0.5 0.1,-0.1 0.1,-0.1 0.2,-0.2 0.3,-0.2 0.3,-0.6 0.1,-0.8 -0.2,-0.2 -0.5,-0.3 -0.7,-0.1 -0.2,-0.2 -0.2,-0.1 -0.3,-0.1 -0.2,0.1 -0.4,0.2 -0.7,0.3 -0.2,0.1 -0.5,0.1 -0.8,0.2 -0.1,0 -0.3,0 -0.4,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.2,0 -0.2,0 v 0 0 H 34.1 34 c -0.1,0 -0.1,0 -0.2,0 -0.6,-0.1 -1.2,-0.3 -1.7,-0.5 -0.6,-0.3 -1.1,-0.6 -1.6,-1.1 -0.5,-0.4 -0.9,-1 -1.3,-1.6 -0.3,-0.6 -0.6,-1.3 -0.7,-2 -0.1,-0.3 -0.1,-0.7 -0.1,-1.1 0,-0.1 0,-0.2 0,-0.3 v 0 0 -0.1 -0.1 c 0,-0.2 0,-0.4 0.1,-0.6 0.3,-1.5 1,-3 2.2,-4.2 0.3,-0.3 0.6,-0.5 1,-0.8 0.3,-0.2 0.7,-0.4 1.1,-0.6 0.4,-0.2 0.8,-0.3 1.2,-0.4 0.4,-0.1 0.8,-0.2 1.2,-0.2 0.2,0 0.4,0 0.6,0 0.1,0 0.1,0 0.1,0 h 0.2 0.1 v 0 0 h 0.2 c 0.5,0 0.9,0.1 1.4,0.2 0.9,0.2 1.8,0.5 2.6,1 1.6,0.9 3,2.3 3.9,4 0.4,0.8 0.7,1.8 0.9,2.7 0,0.2 0.1,0.5 0.1,0.7 v 0.2 0.2 c 0,0.1 0,0.1 0,0.2 0,0.1 0,0.1 0,0.2 v 0.2 0.2 c 0,0.1 0,0.3 0,0.4 0,0.3 0,0.5 -0.1,0.8 0,0.3 -0.1,0.5 -0.1,0.8 -0.1,0.1 -0.1,0.3 -0.2,0.6 -0.1,0.5 -0.3,1 -0.5,1.5 -0.4,1 -0.9,1.9 -1.5,2.7 -1.2,1.7 -2.9,3.1 -4.8,3.9 -1,0.4 -2,0.7 -3,0.9 -0.5,0.1 -1,0.1 -1.6,0.2 h -0.1 -0.1 -0.2 -0.3 -0.1 c 0.1,0 0,0 0,0 h -0.1 c -0.3,0 -0.6,0 -0.8,0 -1.1,-0.1 -2.2,-0.3 -3.3,-0.6 -1.1,-0.3 -2.1,-0.7 -3.1,-1.2 -2,-1 -3.7,-2.5 -5.1,-4.2 -0.7,-0.9 -1.3,-1.8 -1.8,-2.8 -0.5,-1 -0.9,-2 -1.2,-3 -0.3,-1 -0.5,-2.1 -0.5,-3.2 v -0.2 -0.1 0 -0.1 -0.2 0 -0.1 -0.1 -0.3 0 0 -0.1 c 0,-0.1 0,-0.3 0,-0.4 0,-0.5 0.1,-1.1 0.1,-1.6 0.1,-0.5 0.2,-1.1 0.3,-1.6 0.1,-0.5 0.2,-1.1 0.4,-1.6 0.3,-1.1 0.7,-2.1 1.1,-3.1 0.9,-2 2.1,-3.7 3.5,-5.1 0.4,-0.3 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.6 1.2,-0.9 0.4,-0.3 0.8,-0.5 1.3,-0.7 0.2,-0.1 0.4,-0.2 0.7,-0.3 0.1,0 0.2,-0.1 0.3,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.4,-0.5 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.2,-0.1 0.5,-0.1 0.7,-0.2 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,0 0.4,-0.1 h 0.2 0.2 c 0.1,0 0.2,0 0.4,-0.1 0.1,0 0.3,0 0.4,-0.1 0.1,0 0.3,0 0.4,0 0.1,0 0.2,0 0.3,0 h 0.2 0.1 0.1 c 0.1,0 0.3,0 0.4,0 h 0.2 c 0,0 0.1,0 0,0 v 0 h 0.1 c 0.1,0 0.2,0 0.4,0 0.5,0 0.9,0 1.4,0 0.9,0 1.8,0.1 2.7,0.3 1.8,0.3 3.4,0.9 4.9,1.6 1.5,0.7 2.9,1.6 4,2.6 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.5,0.5 1,1.1 1.4,1.6 0.8,1.1 1.5,2.1 2,3.2 0,0.1 0.1,0.1 0.1,0.2 0,0.1 0.1,0.1 0.1,0.2 0.1,0.1 0.1,0.3 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.2,0.5 0.4,0.9 0.5,1.4 0.2,0.7 0.4,1.3 0.6,1.9 0.1,0.2 0.3,0.4 0.5,0.3 0.2,0 0.4,-0.2 0.4,-0.4 -0.2,-1.1 -0.2,-1.8 -0.3,-2.6 z"
   id="path3778"
   inkscape:connector-curvature="0"
   style="fill:url(#SVGID_1_)" />
</svg> - mediatype: image/svg+xml + - base64data: <?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 20.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->

<svg
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:cc="http://creativecommons.org/ns#"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:svg="http://www.w3.org/2000/svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   version="1.1"
   id="Layer_1"
   x="0px"
   y="0px"
   width="57.799999"
   height="57.799999"
   viewBox="0 0 57.799999 57.8"
   xml:space="preserve"
   sodipodi:docname="logo_small.svg"
   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
   id="metadata3785"><rdf:RDF><cc:Work
       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
   id="defs3783" /><sodipodi:namedview
   pagecolor="#ffffff"
   bordercolor="#666666"
   borderopacity="1"
   objecttolerance="10"
   gridtolerance="10"
   guidetolerance="10"
   inkscape:pageopacity="0"
   inkscape:pageshadow="2"
   inkscape:window-width="2560"
   inkscape:window-height="1386"
   id="namedview3781"
   showgrid="false"
   inkscape:zoom="13.858714"
   inkscape:cx="75.412904"
   inkscape:cy="23.077606"
   inkscape:window-x="0"
   inkscape:window-y="0"
   inkscape:window-maximized="1"
   inkscape:current-layer="Layer_1" />
<style
   type="text/css"
   id="style3769">
	.st0{fill:#E6E7E8;}
	.st1{fill:url(#SVGID_1_);}
</style>

<linearGradient
   id="SVGID_1_"
   gradientUnits="userSpaceOnUse"
   x1="26.700001"
   y1="-9.8501997"
   x2="26.700001"
   y2="43.166"
   gradientTransform="matrix(1,0,0,-1,2,60.000002)">
	<stop
   offset="0"
   style="stop-color:#FFF100"
   id="stop3773" />
	<stop
   offset="1"
   style="stop-color:#F05A28"
   id="stop3775" />
</linearGradient>
<path
   class="st1"
   d="m 55.1,25.500002 c -0.1,-1 -0.3,-2.1 -0.6,-3.3 -0.3,-1.2 -0.8,-2.6 -1.5,-4 -0.7,-1.4 -1.6,-2.9 -2.8,-4.3 -0.5,-0.6 -1,-1.1 -1.5,-1.6 0.8,-3.2000004 -1,-6.0000004 -1,-6.0000004 -3.1,-0.2 -5.1,1 -5.8,1.5 -0.1,-0.1 -0.2,-0.1 -0.4,-0.2 -0.5,-0.2 -1,-0.4 -1.6,-0.6 -0.6,-0.2 -1.1,-0.3 -1.7,-0.5 -0.6,-0.1 -1.2,-0.3 -1.8,-0.3 -0.1,0 -0.2,0 -0.3,0 C 34.8,1.8000016 30.9,1.5258789e-6 30.9,1.5258789e-6 26.6,2.8000016 25.7,6.6000016 25.7,6.6000016 c 0,0 0,0.1 0,0.2 -0.2,0.1 -0.5,0.1 -0.7,0.2 -0.3,0.1 -0.7,0.2 -1,0.3 -0.3,0.1 -0.7,0.3 -1,0.4 -0.7,0.3 -1.3,0.6 -1.9,1 -0.6,0.3 -1.2,0.7 -1.8,1.1 -0.1,0 -0.2,-0.1 -0.2,-0.1 -6,-2.3 -11.4,0.5000004 -11.4,0.5000004 -0.5,6.4 2.4,10.4 3,11.2 -0.1,0.4 -0.3,0.8 -0.4,1.2 -0.4,1.4 -0.8,2.9 -1,4.5 0,0.2 -0.1,0.4 -0.1,0.7 -5.6,2.7 -7.2,8.4 -7.2,8.4 4.6,5.3 10,5.7 10,5.7 v 0 c 0.7,1.2 1.5,2.4 2.4,3.5 0.4,0.5 0.8,0.9 1.2,1.3 -1.7,4.8 0.2,8.9 0.2,8.9 5.2,0.2 8.6,-2.3 9.3,-2.8 0.5,0.2 1,0.3 1.6,0.5 1.6,0.4 3.2,0.6 4.8,0.7 0.4,0 0.8,0 1.2,0 h 0.2 0.1 0.3 0.3 v 0 c 2.4,3.5 6.7,4 6.7,4 3.4,-3.6 3.2,-7.2 3.2,-7.2 l -0.1,-0.1 c 0.7,-0.5 1.3,-1 1.9,-1.5 1.2,-1.1 2.3,-2.4 3.2,-3.7 0.1,-0.1 0.2,-0.3 0.2,-0.4 3.4,0.2 5.9,-2.1 5.9,-2.1 -0.6,-4 -3.1,-5.7 -3.1,-5.7 h -0.1 c 0,-0.2 0,-0.5 0.1,-0.7 0,-0.4 0,-0.8 0,-1.2 v -0.3 -0.1 -0.1 c 0,-0.1 0,-0.1 0,-0.1 v -0.2 -0.3 c 0,-0.1 0,-0.2 0,-0.3 0,-0.1 0,-0.2 0,-0.3 v -0.3 -0.3 c -0.1,-0.4 -0.1,-0.8 -0.2,-1.2 -0.4,-1.5 -1,-3 -1.8,-4.3 -0.8,-1.3 -1.8,-2.5 -2.9,-3.5 -1.1,-1 -2.4,-1.8 -3.7,-2.4 -1.3,-0.6 -2.7,-1 -4.1,-1.1 -0.7,-0.1 -1.4,-0.1 -2,-0.1 h -0.3 -0.1 -0.1 -0.1 -0.3 c -0.1,0 -0.2,0 -0.3,0 -0.3,0 -0.7,0.1 -1,0.1 -1.4,0.3 -2.7,0.7 -3.8,1.4 -1.1,0.7 -2.1,1.5 -2.9,2.5 -0.8,1 -1.4,2 -1.9,3.1 -0.4,1.1 -0.7,2.2 -0.7,3.3 0,0.3 0,0.6 0,0.8 0,0.1 0,0.1 0,0.2 v 0.2 c 0,0.1 0,0.3 0,0.4 0.1,0.6 0.2,1.1 0.3,1.6 0.3,1 0.8,2 1.4,2.8 0.6,0.8 1.3,1.5 2.1,2 0.8,0.5 1.6,0.9 2.4,1.1 0.8,0.2 1.6,0.3 2.3,0.3 0.1,0 0.2,0 0.3,0 h 0.1 0.1 c 0.1,0 0.2,0 0.2,0 0,0 0,0 0.1,0 h 0.1 0.1 c 0.1,0 0.2,0 0.3,0 0.1,0 0.2,0 0.3,-0.1 0.2,0 0.3,-0.1 0.5,-0.1 0.3,-0.1 0.6,-0.2 0.9,-0.4 0.3,-0.1 0.5,-0.3 0.8,-0.5 0.1,-0.1 0.1,-0.1 0.2,-0.2 0.3,-0.2 0.3,-0.6 0.1,-0.8 -0.2,-0.2 -0.5,-0.3 -0.7,-0.1 -0.2,-0.2 -0.2,-0.1 -0.3,-0.1 -0.2,0.1 -0.4,0.2 -0.7,0.3 -0.2,0.1 -0.5,0.1 -0.8,0.2 -0.1,0 -0.3,0 -0.4,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.1,0 -0.2,0 -0.1,0 -0.2,0 -0.2,0 v 0 0 H 34.1 34 c -0.1,0 -0.1,0 -0.2,0 -0.6,-0.1 -1.2,-0.3 -1.7,-0.5 -0.6,-0.3 -1.1,-0.6 -1.6,-1.1 -0.5,-0.4 -0.9,-1 -1.3,-1.6 -0.3,-0.6 -0.6,-1.3 -0.7,-2 -0.1,-0.3 -0.1,-0.7 -0.1,-1.1 0,-0.1 0,-0.2 0,-0.3 v 0 0 -0.1 -0.1 c 0,-0.2 0,-0.4 0.1,-0.6 0.3,-1.5 1,-3 2.2,-4.2 0.3,-0.3 0.6,-0.5 1,-0.8 0.3,-0.2 0.7,-0.4 1.1,-0.6 0.4,-0.2 0.8,-0.3 1.2,-0.4 0.4,-0.1 0.8,-0.2 1.2,-0.2 0.2,0 0.4,0 0.6,0 0.1,0 0.1,0 0.1,0 h 0.2 0.1 v 0 0 h 0.2 c 0.5,0 0.9,0.1 1.4,0.2 0.9,0.2 1.8,0.5 2.6,1 1.6,0.9 3,2.3 3.9,4 0.4,0.8 0.7,1.8 0.9,2.7 0,0.2 0.1,0.5 0.1,0.7 v 0.2 0.2 c 0,0.1 0,0.1 0,0.2 0,0.1 0,0.1 0,0.2 v 0.2 0.2 c 0,0.1 0,0.3 0,0.4 0,0.3 0,0.5 -0.1,0.8 0,0.3 -0.1,0.5 -0.1,0.8 -0.1,0.1 -0.1,0.3 -0.2,0.6 -0.1,0.5 -0.3,1 -0.5,1.5 -0.4,1 -0.9,1.9 -1.5,2.7 -1.2,1.7 -2.9,3.1 -4.8,3.9 -1,0.4 -2,0.7 -3,0.9 -0.5,0.1 -1,0.1 -1.6,0.2 h -0.1 -0.1 -0.2 -0.3 -0.1 c 0.1,0 0,0 0,0 h -0.1 c -0.3,0 -0.6,0 -0.8,0 -1.1,-0.1 -2.2,-0.3 -3.3,-0.6 -1.1,-0.3 -2.1,-0.7 -3.1,-1.2 -2,-1 -3.7,-2.5 -5.1,-4.2 -0.7,-0.9 -1.3,-1.8 -1.8,-2.8 -0.5,-1 -0.9,-2 -1.2,-3 -0.3,-1 -0.5,-2.1 -0.5,-3.2 v -0.2 -0.1 0 -0.1 -0.2 0 -0.1 -0.1 -0.3 0 0 -0.1 c 0,-0.1 0,-0.3 0,-0.4 0,-0.5 0.1,-1.1 0.1,-1.6 0.1,-0.5 0.2,-1.1 0.3,-1.6 0.1,-0.5 0.2,-1.1 0.4,-1.6 0.3,-1.1 0.7,-2.1 1.1,-3.1 0.9,-2 2.1,-3.7 3.5,-5.1 0.4,-0.3 0.7,-0.7 1.1,-1 0.4,-0.3 0.8,-0.6 1.2,-0.9 0.4,-0.3 0.8,-0.5 1.3,-0.7 0.2,-0.1 0.4,-0.2 0.7,-0.3 0.1,0 0.2,-0.1 0.3,-0.1 0.1,-0.1 0.2,-0.1 0.3,-0.1 0.4,-0.2 0.9,-0.4 1.4,-0.5 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.2,-0.1 0.5,-0.1 0.7,-0.2 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,-0.1 0.4,-0.1 0.1,0 0.2,0 0.4,-0.1 h 0.2 0.2 c 0.1,0 0.2,0 0.4,-0.1 0.1,0 0.3,0 0.4,-0.1 0.1,0 0.3,0 0.4,0 0.1,0 0.2,0 0.3,0 h 0.2 0.1 0.1 c 0.1,0 0.3,0 0.4,0 h 0.2 c 0,0 0.1,0 0,0 v 0 h 0.1 c 0.1,0 0.2,0 0.4,0 0.5,0 0.9,0 1.4,0 0.9,0 1.8,0.1 2.7,0.3 1.8,0.3 3.4,0.9 4.9,1.6 1.5,0.7 2.9,1.6 4,2.6 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.1,0.1 0.2,0.2 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.1,0.1 0.3,0.3 0.4,0.4 0.5,0.5 1,1.1 1.4,1.6 0.8,1.1 1.5,2.1 2,3.2 0,0.1 0.1,0.1 0.1,0.2 0,0.1 0.1,0.1 0.1,0.2 0.1,0.1 0.1,0.3 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.1,0.1 0.1,0.2 0.2,0.4 0.2,0.5 0.4,0.9 0.5,1.4 0.2,0.7 0.4,1.3 0.6,1.9 0.1,0.2 0.3,0.4 0.5,0.3 0.2,0 0.4,-0.2 0.4,-0.4 -0.2,-1.1 -0.2,-1.8 -0.3,-2.6 z"
   id="path3778"
   inkscape:connector-curvature="0"
   style="fill:url(#SVGID_1_)" />
</svg> + mediatype: image/svg+xml install: spec: clusterPermissions: - - rules: - - apiGroups: - - "" - resources: - - configmaps - - persistentvolumeclaims - - secrets - - serviceaccounts - - services - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - "" - resources: - - events - verbs: - - create - - get - - list - - watch - - apiGroups: - - "" - resources: - - pods - verbs: - - get - - list - - watch - - apiGroups: - - apps - - extensions - resources: - - deployments - - deployments/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - integreatly.org - resources: - - grafanadashboards - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - integreatly.org - resources: - - grafanadashboards/status - verbs: - - get - - patch - - update - - apiGroups: - - integreatly.org - resources: - - grafanadatasources - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - integreatly.org - resources: - - grafanadatasources/status - verbs: - - get - - patch - - update - - apiGroups: - - integreatly.org - resources: - - grafanas - - grafanas/finalizers - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - integreatly.org - resources: - - grafanas/status - verbs: - - get - - patch - - update - - apiGroups: - - networking.k8s.io - resources: - - ingresses - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - route.openshift.io - resources: - - routes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch - - apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create - - apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create - serviceAccountName: default + - rules: + - apiGroups: + - "" + resources: + - configmaps + - persistentvolumeclaims + - secrets + - serviceaccounts + - services + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - get + - list + - watch + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - list + - watch + - apiGroups: + - apps + - extensions + resources: + - deployments + - deployments/finalizers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - integreatly.org + resources: + - grafanadashboards + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - integreatly.org + resources: + - grafanadashboards/status + verbs: + - get + - patch + - update + - apiGroups: + - integreatly.org + resources: + - grafanadatasources + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - integreatly.org + resources: + - grafanadatasources/status + verbs: + - get + - patch + - update + - apiGroups: + - integreatly.org + resources: + - grafanas + - grafanas/finalizers + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - integreatly.org + resources: + - grafanas/status + verbs: + - get + - patch + - update + - apiGroups: + - networking.k8s.io + resources: + - ingresses + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - route.openshift.io + resources: + - routes + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create + serviceAccountName: default deployments: - - name: grafana-operator-controller-manager - spec: - replicas: 1 - selector: - matchLabels: + - name: grafana-operator-controller-manager + spec: + replicas: 1 + selector: + matchLabels: + control-plane: controller-manager + strategy: {} + template: + metadata: + labels: control-plane: controller-manager - strategy: {} - template: - metadata: - labels: - control-plane: controller-manager - spec: - containers: - - args: - - --secure-listen-address=0.0.0.0:8443 - - --upstream=http://127.0.0.1:8080/ - - --logtostderr=true - - --v=10 - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 - name: kube-rbac-proxy - ports: - - containerPort: 8443 - name: https - resources: {} - - args: - - --health-probe-bind-address=:8081 - - --metrics-bind-address=127.0.0.1:8080 - - --leader-elect - - --zap-log-level=error - command: - - /manager - env: - - name: POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: WATCH_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.annotations['olm.targetNamespaces'] - image: quay.io/grafana-operator/grafana-operator:v4.0.0 - imagePullPolicy: Always - livenessProbe: - httpGet: - path: /healthz - port: 8081 - initialDelaySeconds: 15 - periodSeconds: 20 - name: manager - readinessProbe: - httpGet: - path: /readyz - port: 8081 - initialDelaySeconds: 5 - periodSeconds: 10 - resources: - limits: - cpu: 100m - memory: 300Mi - requests: - cpu: 100m - memory: 100Mi - securityContext: - allowPrivilegeEscalation: false - terminationGracePeriodSeconds: 10 + spec: + containers: + - args: + - --secure-listen-address=0.0.0.0:8443 + - --upstream=http://127.0.0.1:8080/ + - --logtostderr=true + - --v=10 + image: gcr.io/kubebuilder/kube-rbac-proxy:v0.5.0 + name: kube-rbac-proxy + ports: + - containerPort: 8443 + name: https + resources: {} + - args: + - --health-probe-bind-address=:8081 + - --metrics-bind-address=127.0.0.1:8080 + - --leader-elect + - --zap-log-level=error + command: + - /manager + env: + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: WATCH_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.annotations['olm.targetNamespaces'] + image: quay.io/grafana-operator/grafana-operator:v4.0.0 + imagePullPolicy: Always + livenessProbe: + httpGet: + path: /healthz + port: 8081 + initialDelaySeconds: 15 + periodSeconds: 20 + name: manager + readinessProbe: + httpGet: + path: /readyz + port: 8081 + initialDelaySeconds: 5 + periodSeconds: 10 + resources: + limits: + cpu: 100m + memory: 300Mi + requests: + cpu: 100m + memory: 100Mi + securityContext: + allowPrivilegeEscalation: false + terminationGracePeriodSeconds: 10 permissions: - - rules: - - apiGroups: - - "" - - coordination.k8s.io - resources: - - configmaps - - leases - verbs: - - get - - list - - watch - - create - - update - - patch - - delete - - apiGroups: - - "" - resources: - - events - verbs: - - create - - patch - serviceAccountName: default + - rules: + - apiGroups: + - "" + - coordination.k8s.io + resources: + - configmaps + - leases + verbs: + - get + - list + - watch + - create + - update + - patch + - delete + - apiGroups: + - "" + resources: + - events + verbs: + - create + - patch + serviceAccountName: default strategy: deployment installModes: - - supported: true - type: OwnNamespace - - supported: true - type: SingleNamespace - - supported: false - type: MultiNamespace - - supported: false - type: AllNamespaces + - supported: true + type: OwnNamespace + - supported: true + type: SingleNamespace + - supported: false + type: MultiNamespace + - supported: false + type: AllNamespaces keywords: - - grafana + - grafana links: - - name: Grafana Operator - url: https://grafana-operator.domain + - name: Grafana Operator + url: https://grafana-operator.domain maintainers: - - email: pbraun@redhat.com - name: Peter Braun - - email: hstefans@redhat.com - name: Hubert Stefanski + - email: pbraun@redhat.com + name: Peter Braun + - email: hstefans@redhat.com + name: Hubert Stefanski maturity: alpha provider: name: Red Hat diff --git a/bundle/manifests/integreatly.org_grafanadatasources.yaml b/bundle/manifests/integreatly.org_grafanadatasources.yaml index 896306503..8126d4730 100644 --- a/bundle/manifests/integreatly.org_grafanadatasources.yaml +++ b/bundle/manifests/integreatly.org_grafanadatasources.yaml @@ -273,6 +273,14 @@ spec: - name type: object status: + properties: + message: + type: string + phase: + type: string + required: + - message + - phase type: object type: object served: true diff --git a/bundle/manifests/integreatly.org_grafanas.yaml b/bundle/manifests/integreatly.org_grafanas.yaml index a4ebcac1b..893707380 100644 --- a/bundle/manifests/integreatly.org_grafanas.yaml +++ b/bundle/manifests/integreatly.org_grafanas.yaml @@ -32,6 +32,12 @@ spec: baseImage: type: string client: + description: Grafana API client settings + properties: + preferService: + type: boolean + timeout: + type: integer type: object config: description: GrafanaConfig is the configuration for grafana @@ -3301,6 +3307,66 @@ spec: - config type: object status: + description: GrafanaStatus defines the observed state of Grafana + properties: + dashboards: + items: + description: Used to keep a dashboard reference without having access to the dashboard struct itself + properties: + folderId: + format: int64 + type: integer + folderName: + type: string + hash: + type: string + name: + type: string + namespace: + type: string + uid: + type: string + required: + - folderId + - folderName + - hash + - name + - namespace + - uid + type: object + type: array + failedPlugins: + items: + description: GrafanaPlugin contains information about a single plugin + properties: + name: + type: string + version: + type: string + required: + - name + - version + type: object + type: array + installedPlugins: + items: + description: GrafanaPlugin contains information about a single plugin + properties: + name: + type: string + version: + type: string + required: + - name + - version + type: object + type: array + message: + type: string + phase: + type: string + previousServiceName: + type: string type: object type: object served: true diff --git a/config/crd/bases/integreatly.org_grafanas.yaml b/config/crd/bases/integreatly.org_grafanas.yaml index f25263032..58f86a6a5 100644 --- a/config/crd/bases/integreatly.org_grafanas.yaml +++ b/config/crd/bases/integreatly.org_grafanas.yaml @@ -44,8 +44,6 @@ spec: type: boolean timeout: type: integer - required: - - preferService type: object config: description: GrafanaConfig is the configuration for grafana diff --git a/controllers/grafana/grafana_controller.go b/controllers/grafana/grafana_controller.go index 4528acf62..3a553bfff 100644 --- a/controllers/grafana/grafana_controller.go +++ b/controllers/grafana/grafana_controller.go @@ -240,10 +240,7 @@ func (r *ReconcileGrafana) manageError(cr *grafanav1alpha1.Grafana, issue error, func (r *ReconcileGrafana) getGrafanaAdminUrl(cr *grafanav1alpha1.Grafana, state *common.ClusterState) (string, error) { // If preferService is true, we skip the routes and try to access grafana // by using the service. - preferService := false - if cr.Spec.Client != nil { - preferService = cr.Spec.Client.PreferService - } + preferService := cr.GetPreferServiceValue() // First try to use the route if it exists. Prefer the route because it also works // when running the operator outside of the cluster diff --git a/controllers/grafana/grafana_reconciler.go b/controllers/grafana/grafana_reconciler.go index 7a9d4c74f..043e0c32b 100644 --- a/controllers/grafana/grafana_reconciler.go +++ b/controllers/grafana/grafana_reconciler.go @@ -63,14 +63,14 @@ func (i *GrafanaReconciler) getGrafanaReadiness(state *common.ClusterState, cr * var actions []common.ClusterAction cfg := config.GetControllerConfig() openshift := cfg.GetConfigBool(config.ConfigOpenshift, false) - if openshift && cr.Spec.Ingress != nil && cr.Spec.Ingress.Enabled && (cr.Spec.Client == nil || !cr.Spec.Client.PreferService) { + if openshift && cr.Spec.Ingress != nil && cr.Spec.Ingress.Enabled && !cr.GetPreferServiceValue() { // On OpenShift, check the route, only if preferService is false actions = append(actions, common.RouteReadyAction{ Ref: state.GrafanaRoute, Msg: "check route readiness", }) } - if !openshift && cr.Spec.Ingress != nil && cr.Spec.Ingress.Enabled && (cr.Spec.Client == nil || !cr.Spec.Client.PreferService) { + if !openshift && cr.Spec.Ingress != nil && cr.Spec.Ingress.Enabled && !cr.GetPreferServiceValue() { // On vanilla Kubernetes, check the ingress,only if preferService is false actions = append(actions, common.IngressReadyAction{ Ref: state.GrafanaIngress, diff --git a/deploy/examples/Grafana.yaml b/deploy/examples/Grafana.yaml index 32aeba3d0..ef0f5490c 100644 --- a/deploy/examples/Grafana.yaml +++ b/deploy/examples/Grafana.yaml @@ -3,6 +3,8 @@ kind: Grafana metadata: name: example-grafana spec: + client: + preferService: true ingress: enabled: True pathType: Prefix