From fd4e501a6ceadf1db9481ce6cc1370d1eaa1b883 Mon Sep 17 00:00:00 2001 From: Periklis Tsirakidis Date: Thu, 11 Jul 2024 16:42:28 +0200 Subject: [PATCH] fix(operator): Skip updating annotations for serviceaccounts (#13450) --- operator/CHANGELOG.md | 1 + operator/internal/manifests/mutate.go | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 8afb94768419..96f1d59a5e1f 100644 --- 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 index 63308bb9ceb6..390ee86db6e6 100644 --- 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 }