Fix csv 4.0 (grafana#522)

* fix: spec.client is not working * update auto generated code * feat: crd migration working as expected * remove required field
rewantsoni · Sep 18, 2021 · fb8ed04 · fb8ed04
1 parent 0638a35
commit fb8ed04
Show file tree

Hide file tree

Showing 9 changed files with 353 additions and 308 deletions.
diff --git 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
diff --git a/bundle/manifests/grafana-operator.clusterserviceversion.yaml b/bundle/manifests/grafana-operator.clusterserviceversion.yaml
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -3,6 +3,8 @@ kind: Grafana
 metadata:
   name: example-grafana
 spec:
+  client:
+    preferService: true
   ingress:
     enabled: True
     pathType: Prefix