add client configuration options

deploy/crds/Grafana.yaml

@@ -115,6 +115,9 @@ spec:
                 labels:
                   type: object
                   description: Additional labels for the serviceaccount
+            client:
+              type: object
+              description: Grafana client settings
             dashboardLabelSelectors:
               type: array
               items:

deploy/examples/oauth/Grafana.yaml

@@ -17,6 +17,7 @@ spec:
   containers:
     - args:
         - '-provider=openshift'
+        - '-pass-basic-auth=false'
         - '-https-address=:9091'
         - '-http-address='
         - '-email-domain=*'
@@ -58,6 +59,7 @@ spec:
   ingress:
     enabled: True
     targetPort: grafana
+    termination: reencrypt
   serviceAccount:
     annotations:
       serviceaccounts.openshift.io/oauth-redirectreference.primary: '{"kind":"OAuthRedirectReference","apiVersion":"v1","reference":{"kind":"Route","name":"grafana-route"}}'

pkg/apis/integreatly/v1alpha1/zz_generated.openapi.go

@@ -301,12 +301,17 @@ func schema_pkg_apis_integreatly_v1alpha1_GrafanaSpec(ref common.ReferenceCallba
 							Ref: ref("./pkg/apis/integreatly/v1alpha1.GrafanaServiceAccount"),
 						},
 					},
+					"client": {
+						SchemaProps: spec.SchemaProps{
+							Ref: ref("./pkg/apis/integreatly/v1alpha1.GrafanaClient"),
+						},
+					},
 				},
 				Required: []string{"config"},
 			},
 		},
 		Dependencies: []string{
-			"./pkg/apis/integreatly/v1alpha1.GrafanaConfig", "./pkg/apis/integreatly/v1alpha1.GrafanaDeployment", "./pkg/apis/integreatly/v1alpha1.GrafanaIngress", "./pkg/apis/integreatly/v1alpha1.GrafanaService", "./pkg/apis/integreatly/v1alpha1.GrafanaServiceAccount", "k8s.io/api/core/v1.Container", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"},
+			"./pkg/apis/integreatly/v1alpha1.GrafanaClient", "./pkg/apis/integreatly/v1alpha1.GrafanaConfig", "./pkg/apis/integreatly/v1alpha1.GrafanaDeployment", "./pkg/apis/integreatly/v1alpha1.GrafanaIngress", "./pkg/apis/integreatly/v1alpha1.GrafanaService", "./pkg/apis/integreatly/v1alpha1.GrafanaServiceAccount", "k8s.io/api/core/v1.Container", "k8s.io/api/core/v1.ResourceRequirements", "k8s.io/apimachinery/pkg/apis/meta/v1.LabelSelector"},
 	}
 }
 

pkg/controller/common/controllerState.go

@@ -10,4 +10,5 @@ type ControllerState struct {
 	AdminPassword      string
 	AdminUrl           string
 	GrafanaReady       bool
+	ClientTimeout      int
 }

pkg/controller/grafana/grafana_controller.go

@@ -26,6 +26,7 @@ import (
 )
 
 const ControllerName = "grafana-controller"
+const DefaultClientTimeoutSeconds = 5
 
 var log = logf.Log.WithName(ControllerName)
 
@@ -202,14 +203,21 @@ func (r *ReconcileGrafana) manageError(cr *i8ly.Grafana, issue error) (reconcile
 
 // Try to find a suitable url to grafana
 func (r *ReconcileGrafana) getGrafanaAdminUrl(cr *i8ly.Grafana, state *common.ClusterState) (string, error) {
+	// If preferService is true, we skip the routes and try to access grafana
+	// by using the serivce.
+	preferService := false
+	if cr.Spec.Client != nil {
+		preferService = cr.Spec.Client.PreferService
+	}
+
 	// First try to use the route if it exists. Prefer the route because it also works
 	// when running the operator outside of the cluster
-	if state.GrafanaRoute != nil {
+	if state.GrafanaRoute != nil && !preferService {
 		return fmt.Sprintf("https://%v", state.GrafanaRoute.Spec.Host), nil
 	}
 
 	// Try the ingress first if on vanilla Kubernetes
-	if state.GrafanaIngress != nil {
+	if state.GrafanaIngress != nil && !preferService {
 		for _, ingress := range state.GrafanaIngress.Status.LoadBalancer.Ingress {
 			if ingress.Hostname != "" {
 				return fmt.Sprintf("https://%v", ingress.Hostname), nil
@@ -263,7 +271,17 @@ func (r *ReconcileGrafana) manageSuccess(cr *i8ly.Grafana, state *common.Cluster
 		AdminPassword:      string(state.AdminSecret.Data[model.GrafanaAdminPasswordEnvVar]),
 		AdminUrl:           url,
 		GrafanaReady:       true,
+		ClientTimeout:      DefaultClientTimeoutSeconds,
+	}
+
+	if cr.Spec.Client != nil && cr.Spec.Client.TimeoutSeconds != nil {
+		seconds := DefaultClientTimeoutSeconds
+		if seconds < 0 {
+			seconds = DefaultClientTimeoutSeconds
+		}
+		controllerState.ClientTimeout = seconds
 	}
+
 	common.ControllerEvents <- controllerState
 
 	log.Info("desired cluster state met")

pkg/controller/grafanadashboard/dashboard_controller.go

@@ -163,7 +163,7 @@ func (r *ReconcileGrafanaDashboard) reconcileDashboards(request reconcile.Reques
 	}
 
 	// Prepare lists
-	dashboardsToDelete := []*i8ly.GrafanaDashboardRef{}
+	var dashboardsToDelete []*i8ly.GrafanaDashboardRef
 
 	// Check if a given dashboard (by name) is present in the list of
 	// dashboards in the namespace
@@ -304,7 +304,8 @@ func (r *ReconcileGrafanaDashboard) getClient() (GrafanaClient, error) {
 		return nil, defaultErrors.New("invalid credentials (password)")
 	}
 
-	return NewGrafanaClient(url, username, password), nil
+	duration := time.Duration(r.state.ClientTimeout)
+	return NewGrafanaClient(url, username, password, duration), nil
 }
 
 // Test if a given dashboard matches an array of label selectors

pkg/controller/grafanadashboard/grafana_client.go

@@ -28,7 +28,7 @@ type GrafanaClientImpl struct {
 	grafanaClient *sdk.Client
 }
 
-func NewGrafanaClient(url, user, password string) GrafanaClient {
+func NewGrafanaClient(url, user, password string, timeoutSeconds time.Duration) GrafanaClient {
 	transport := http.Transport{
 		TLSClientConfig: &tls.Config{
 			InsecureSkipVerify: true,
@@ -37,7 +37,7 @@ func NewGrafanaClient(url, user, password string) GrafanaClient {
 
 	client := &http.Client{
 		Transport: &transport,
-		Timeout:   time.Second * 2,
+		Timeout:   time.Second * timeoutSeconds,
 	}
 
 	return &GrafanaClientImpl{

pkg/controller/model/grafanaRoute.go

@@ -50,6 +50,23 @@ func GetIngressTargetPort(cr *v1alpha1.Grafana) intstr.IntOrString {
 	return intstr.FromString(cr.Spec.Ingress.TargetPort)
 }
 
+func getTermination(cr *v1alpha1.Grafana) v1.TLSTerminationType {
+	if cr.Spec.Ingress == nil {
+		return v1.TLSTerminationEdge
+	}
+
+	switch cr.Spec.Ingress.Termination {
+	case v1.TLSTerminationEdge:
+		return v1.TLSTerminationEdge
+	case v1.TLSTerminationReencrypt:
+		return v1.TLSTerminationReencrypt
+	case v1.TLSTerminationPassthrough:
+		return v1.TLSTerminationPassthrough
+	default:
+		return v1.TLSTerminationEdge
+	}
+}
+
 func getRouteSpec(cr *v1alpha1.Grafana) v1.RouteSpec {
 	return v1.RouteSpec{
 		Path: GetPath(cr),
@@ -62,7 +79,7 @@ func getRouteSpec(cr *v1alpha1.Grafana) v1.RouteSpec {
 			TargetPort: GetIngressTargetPort(cr),
 		},
 		TLS: &v1.TLSConfig{
-			Termination: v1.TLSTerminationReencrypt,
+			Termination: getTermination(cr),
 		},
 		WildcardPolicy: "None",
 	}