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

periklis · periklis · commit bb20e5f8e762 · 2024-08-08T18:32:24.000+02:00
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
 }

Original file line number	Diff line number	Diff line change
`@@ -206,14 +206,12 @@ func mutateServiceMonitor(existing, desired *monitoringv1.ServiceMonitor) {`
`206`	`206`
`207`	`207`	`func mutateIngress(existing, desired *networkingv1.Ingress) {`
`208`	`208`	`existing.Labels = desired.Labels`
`209`		`- existing.Annotations = desired.Annotations`
`210`	`209`	`existing.Spec.DefaultBackend = desired.Spec.DefaultBackend`
`211`	`210`	`existing.Spec.Rules = desired.Spec.Rules`
`212`	`211`	`existing.Spec.TLS = desired.Spec.TLS`
`213`	`212`	`}`
`214`	`213`
`215`	`214`	`func mutateRoute(existing, desired *routev1.Route) {`
`216`		`- existing.Annotations = desired.Annotations`
`217`	`215`	`existing.Labels = desired.Labels`
`218`	`216`	`existing.Spec = desired.Spec`
`219`	`217`	`}`