From 3ae9030e1c3a5f1dd816af3af1eb6922c3b88c23 Mon Sep 17 00:00:00 2001 From: celestialorb Date: Wed, 24 May 2023 11:13:37 -0700 Subject: [PATCH 1/2] removing application of annotations from alert service --- controllers/model/grafanaAlertService.go | 9 --------- 1 file changed, 9 deletions(-) diff --git a/controllers/model/grafanaAlertService.go b/controllers/model/grafanaAlertService.go index 40d45addf..d063208f9 100644 --- a/controllers/model/grafanaAlertService.go +++ b/controllers/model/grafanaAlertService.go @@ -20,21 +20,12 @@ func getAlertServiceLabels(cr *v1alpha1.Grafana) map[string]string { return cr.Spec.Service.Labels } -func getAlertServiceAnnotations(cr *v1alpha1.Grafana, existing map[string]string) map[string]string { - if cr.Spec.Service == nil { - return existing - } - - return MergeAnnotations(cr.Spec.Service.Annotations, existing) -} - func GrafanaAlertService(cr *v1alpha1.Grafana) *v1.Service { return &v1.Service{ ObjectMeta: v12.ObjectMeta{ Name: getAlertServiceName(), Namespace: cr.Namespace, Labels: getAlertServiceLabels(cr), - Annotations: getAlertServiceAnnotations(cr, nil), }, Spec: v1.ServiceSpec{ ClusterIP: "None", From 2f09816b7861b37daf108767dc7dedd3f834b245 Mon Sep 17 00:00:00 2001 From: celestialorb Date: Wed, 24 May 2023 11:18:07 -0700 Subject: [PATCH 2/2] formatting grafana alert service --- controllers/model/grafanaAlertService.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/model/grafanaAlertService.go b/controllers/model/grafanaAlertService.go index d063208f9..09332a089 100644 --- a/controllers/model/grafanaAlertService.go +++ b/controllers/model/grafanaAlertService.go @@ -23,9 +23,9 @@ func getAlertServiceLabels(cr *v1alpha1.Grafana) map[string]string { func GrafanaAlertService(cr *v1alpha1.Grafana) *v1.Service { return &v1.Service{ ObjectMeta: v12.ObjectMeta{ - Name: getAlertServiceName(), - Namespace: cr.Namespace, - Labels: getAlertServiceLabels(cr), + Name: getAlertServiceName(), + Namespace: cr.Namespace, + Labels: getAlertServiceLabels(cr), }, Spec: v1.ServiceSpec{ ClusterIP: "None",