Skip to content

Commit

Permalink
do not merge CR serviceAnnotations into grafanaAlert service
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Czarkowski <username.taken@gmail.com>
  • Loading branch information
paulczar committed May 22, 2023
1 parent f41668f commit 48b6af5
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions controllers/model/grafanaAlertService.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ func getAlertServiceLabels(cr *v1alpha1.Grafana) map[string]string {
}

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)
return existing
}

func GrafanaAlertService(cr *v1alpha1.Grafana) *v1.Service {
Expand Down

0 comments on commit 48b6af5

Please sign in to comment.