From 53280abf163de1a1441fb81663008ff2a9cc8c1f 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 3491f2e1edf1c..8f8dbed05cb75 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -2,6 +2,7 @@ ## Release 5.6.22 +- [13708](https://github.com/grafana/loki/pull/13708) **periklis**: fix(operator): Don't overwrite annotations for LokiStack ingress resources - [openshift#338](https://github.com/openshift/loki/pull/338) **xperimental**: Remove unused telemetry metrics - [13512](https://github.com/grafana/loki/pull/13512) **xperimental**: feat(operator): Add alert for discarded samples diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go index 6ba0c77c891c4..a8b4dfb42ee92 100644 --- a/operator/internal/manifests/mutate.go +++ b/operator/internal/manifests/mutate.go @@ -186,14 +186,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 }