From 602160e61ca0d7dae3c3c908e96efe6def3339f5 Mon Sep 17 00:00:00 2001 From: Igor Beliakov Date: Mon, 18 Jul 2022 17:23:01 +0200 Subject: [PATCH] fix: use non-fqdn url for grafana to support non-standard cluster names Signed-off-by: Igor Beliakov --- controllers/grafana/grafana_controller.go | 12 +++++++----- controllers/grafana/grafana_controller_test.go | 8 ++++---- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/controllers/grafana/grafana_controller.go b/controllers/grafana/grafana_controller.go index 0ace74817..be3d21a5b 100644 --- a/controllers/grafana/grafana_controller.go +++ b/controllers/grafana/grafana_controller.go @@ -30,8 +30,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/source" ) -const ControllerName = "grafana-controller" -const DefaultClientTimeoutSeconds = 5 +const ( + ControllerName = "grafana-controller" + DefaultClientTimeoutSeconds = 5 +) var log = logf.Log.WithName(ControllerName) @@ -266,7 +268,7 @@ func (r *ReconcileGrafana) getGrafanaAdminUrl(cr *grafanav1alpha1.Grafana, state } } - var servicePort = int32(model.GetGrafanaPort(cr)) + servicePort := int32(model.GetGrafanaPort(cr)) // Otherwise rely on the service if state.GrafanaService != nil { @@ -279,11 +281,11 @@ func (r *ReconcileGrafana) getGrafanaAdminUrl(cr *grafanav1alpha1.Grafana, state case "https": protocol = "https" default: - return "", stdErr.New(fmt.Sprintf("server protocol %v is not supported, please use either http or https", protocol)) + return "", fmt.Errorf("server protocol %v is not supported, please use either http or https", protocol) } } - return fmt.Sprintf("%v://%v.%v.svc.cluster.local:%d", protocol, state.GrafanaService.Name, cr.Namespace, + return fmt.Sprintf("%v://%v.%v:%d", protocol, state.GrafanaService.Name, cr.Namespace, servicePort), nil } diff --git a/controllers/grafana/grafana_controller_test.go b/controllers/grafana/grafana_controller_test.go index 04c989bf4..43f0fb67d 100644 --- a/controllers/grafana/grafana_controller_test.go +++ b/controllers/grafana/grafana_controller_test.go @@ -136,25 +136,25 @@ func TestReconcileGrafana_getGrafanaAdminUrl(t *testing.T) { { name: "server spec is nil", server: nil, - want: "http://grafana.monitoring.svc.cluster.local:3000", + want: "http://grafana.monitoring:3000", wantFail: false, }, { name: "server protocol: not specified", server: &Srv{Protocol: ""}, - want: "http://grafana.monitoring.svc.cluster.local:3000", + want: "http://grafana.monitoring:3000", wantFail: false, }, { name: "server protocol: http", server: &Srv{Protocol: "http"}, - want: "http://grafana.monitoring.svc.cluster.local:3000", + want: "http://grafana.monitoring:3000", wantFail: false, }, { name: "server protocol: https", server: &Srv{Protocol: "https"}, - want: "https://grafana.monitoring.svc.cluster.local:3000", + want: "https://grafana.monitoring:3000", wantFail: false, }, {