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

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

Merged
merged 2 commits into from
Aug 7, 2024
+0 −2
Merged

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

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d660b00
fix(operator): Merge annotations for the LokiStack ingress resources
periklis Jul 30, 2024
747bfe9
Merge branch 'main' into operator-merge-route-annotations
periklis Aug 7, 2024
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
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
Loading