fix(operator): Don't overwrite annotations for LokiStack ingress resources (grafana#13708)

periklis · periklis · commit 53280abf163d · 2024-08-08T18:36:22.000+02:00
diff --git 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
@@ -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
 }

Original file line number	Diff line number	Diff line change
`@@ -186,14 +186,12 @@ func mutateServiceMonitor(existing, desired *monitoringv1.ServiceMonitor) {`
`186`	`186`
`187`	`187`	`func mutateIngress(existing, desired *networkingv1.Ingress) {`
`188`	`188`	`existing.Labels = desired.Labels`
`189`		`- existing.Annotations = desired.Annotations`
`190`	`189`	`existing.Spec.DefaultBackend = desired.Spec.DefaultBackend`
`191`	`190`	`existing.Spec.Rules = desired.Spec.Rules`
`192`	`191`	`existing.Spec.TLS = desired.Spec.TLS`
`193`	`192`	`}`
`194`	`193`
`195`	`194`	`func mutateRoute(existing, desired *routev1.Route) {`
`196`		`- existing.Annotations = desired.Annotations`
`197`	`195`	`existing.Labels = desired.Labels`
`198`	`196`	`existing.Spec = desired.Spec`
`199`	`197`	`}`