fix(operator): Skip updating annotations for serviceaccounts (grafana#13450)

periklis · periklis · commit ae94b57ece4a · 2024-07-11T16:48:02.000+02:00
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.8.9
 
+- [13450](https://github.com/grafana/loki/pull/13450) **periklis**: fix(operator): Skip updating annotations for serviceaccounts
 - [13430](https://github.com/grafana/loki/pull/13430) **periklis**: fix(operator): Support v3.1.0 in OpenShift dashboards
 - [318](https://github.com/openshift/loki/pull/318) **periklis**: fix(operator): Disable structured metadata
 - [13422](https://github.com/grafana/loki/pull/13422) **periklis** feat(operator): Update Loki operand to v3.1.0
diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go
@@ -162,7 +162,6 @@ func mutateSecret(existing, desired *corev1.Secret) {
 }
 
 func mutateServiceAccount(existing, desired *corev1.ServiceAccount) {
-	existing.Annotations = desired.Annotations
 	existing.Labels = desired.Labels
 }
 

Original file line number	Diff line number	Diff line change
`@@ -162,7 +162,6 @@ func mutateSecret(existing, desired *corev1.Secret) {`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`func mutateServiceAccount(existing, desired *corev1.ServiceAccount) {`
`165`		`- existing.Annotations = desired.Annotations`
`166`	`165`	`existing.Labels = desired.Labels`
`167`	`166`	`}`
`168`	`167`