From bb20e5f8e7623d96b11e6cc68979900c3fc82c10 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Wed, 7 Aug 2024 20:05:42 +0200 Subject: [PATCH] fix(operator): Don't overwrite annotations for LokiStack ingress resources (#13708) --- operator/CHANGELOG.md | 1 + operator/internal/manifests/mutate.go | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index f18eb4ec71ed..ae28ea621cbd 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -2,6 +2,7 @@ ## Release 5.9.5 +- [13708](https://github.com/grafana/loki/pull/13708) **periklis**: fix(operator): Don't overwrite annotations for LokiStack ingress resources - [13512](https://github.com/grafana/loki/pull/13512) **xperimental**: feat(operator): Add alert for discarded samples - [13497](https://github.com/grafana/loki/pull/13497) **xperimental**: fix(operator): Remove duplicate conditions from status diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go index 390ee86db6e6..6abe34607803 100644 --- a/operator/internal/manifests/mutate.go +++ b/operator/internal/manifests/mutate.go @@ -206,14 +206,12 @@ func mutateServiceMonitor(existing, desired *monitoringv1.ServiceMonitor) { func mutateIngress(existing, desired *networkingv1.Ingress) { existing.Labels = desired.Labels - existing.Annotations = desired.Annotations existing.Spec.DefaultBackend = desired.Spec.DefaultBackend existing.Spec.Rules = desired.Spec.Rules existing.Spec.TLS = desired.Spec.TLS } func mutateRoute(existing, desired *routev1.Route) { - existing.Annotations = desired.Annotations existing.Labels = desired.Labels existing.Spec = desired.Spec }