Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release-5.9] Backport PR grafana/loki#13708 #340

Merged
merged 1 commit into from
Aug 8, 2024
Merged

[release-5.9] Backport PR grafana/loki#13708 #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions operator/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 0 additions & 2 deletions operator/internal/manifests/mutate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down