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

openshift-merge-bot[bot] · web-flow · commit 74038d25177a · 2024-07-11T15:46:21.000Z
[release-5.9] Backport PR grafana#13450
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
 }
 

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ func mutateSecret(existing, desired *corev1.Secret) {`
`168`	`168`	`}`
`169`	`169`
`170`	`170`	`func mutateServiceAccount(existing, desired *corev1.ServiceAccount) {`
`171`		`- existing.Annotations = desired.Annotations`
`172`	`171`	`existing.Labels = desired.Labels`
`173`	`172`	`}`
`174`	`173`