Skip to content

Commit

Permalink
fix(operator): Don't overwrite annotations for LokiStack ingress reso…
Browse files Browse the repository at this point in the history
…urces (grafana#13708)
  • Loading branch information
periklis committed Aug 8, 2024
1 parent 628b254 commit c0e63e1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

## Release 5.8.11

- [13708](https://github.com/grafana/loki/pull/13708) **periklis**: fix(operator): Don't overwrite annotations for LokiStack ingress resources
- **xperimental**: Backport status handling in controller
- [12212](https://github.com/grafana/loki/pull/12212) **xperimental**: Do not overwrite complete status when updating schemas
- [12228](https://github.com/grafana/loki/pull/12228) **xperimental**: Restructure LokiStack metrics
Expand Down
2 changes: 0 additions & 2 deletions operator/internal/manifests/mutate.go
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,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
}
Expand Down

0 comments on commit c0e63e1

Please sign in to comment.