Merge pull request #326 from periklis/backport-pr-13450-5.8

[release-5.8] Backport PR grafana#13450
openshift · Jul 11, 2024 · 35515d1 · 35515d1
2 parents 46c68f7 + ae94b57
commit 35515d1
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.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 change
@@ Expand Up / @@ -162,7 +162,6 @@ func mutateSecret(existing, desired *corev1.Secret) { @@
     }
     func mutateServiceAccount(existing, desired *corev1.ServiceAccount) {
-    	existing.Annotations = desired.Annotations
     	existing.Labels = desired.Labels
     }
@@ Expand Down @@