Merge pull request #340 from periklis/backport-pr-13708-5.9

[release-5.9] Backport PR grafana#13708
openshift · Aug 8, 2024 · d6bfebd · d6bfebd
2 parents d21501d + bb20e5f
commit d6bfebd
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git 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
@@ -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
 }