Merge pull request grafana#325 from periklis/backport-pr-13450-5.9

[release-5.9] Backport PR grafana#13450
periklis · Jul 11, 2024 · 74038d2 · 74038d2
2 parents 6f38771 + fd4e501
commit 74038d2
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 1 deletion.
diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## Release 5.9.4
 
+- [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
 - [13422](https://github.com/grafana/loki/pull/13422) **periklis** feat(operator): Update Loki operand to v3.1.0
 - [13369](https://github.com/grafana/loki/pull/13369) **jatinsu**: feat(operator): Add support for the volume API

diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go
@@ -168,7 +168,6 @@ func mutateSecret(existing, desired *corev1.Secret) {
 }
 
 func mutateServiceAccount(existing, desired *corev1.ServiceAccount) {
-	existing.Annotations = desired.Annotations
 	existing.Labels = desired.Labels
 }