From 4721d7efd308e7d85fe03464041179bb1414fe8c Mon Sep 17 00:00:00 2001 From: Gerard Vanloo Date: Thu, 23 Mar 2023 06:18:23 -0400 Subject: [PATCH] operator: Remove mutations to non-updatable statefulset fields (#8875) --- operator/CHANGELOG.md | 1 + operator/internal/manifests/mutate.go | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index 82e5f658f3..8133f2755a 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [8875](https://github.com/grafana/loki/pull/8875) **Red-GV**: Remove mutations to non-updatable statefulset fields - [7451](https://github.com/grafana/loki/pull/7451) **btaani**: Add support for rules configmap sharding - [8672](https://github.com/grafana/loki/pull/8672) **periklis**: Add support for memberlist bind network configuration - [8748](https://github.com/grafana/loki/pull/8748) **periklis**: Add alertingrule tenant id label for all rules diff --git a/operator/internal/manifests/mutate.go b/operator/internal/manifests/mutate.go index 6ba0c77c89..d87979104d 100644 --- a/operator/internal/manifests/mutate.go +++ b/operator/internal/manifests/mutate.go @@ -234,13 +234,7 @@ func mutateStatefulSet(existing, desired *appsv1.StatefulSet) error { if existing.CreationTimestamp.IsZero() { existing.Spec.Selector = desired.Spec.Selector } - existing.Spec.PodManagementPolicy = desired.Spec.PodManagementPolicy existing.Spec.Replicas = desired.Spec.Replicas - for i := range existing.Spec.VolumeClaimTemplates { - existing.Spec.VolumeClaimTemplates[i].TypeMeta = desired.Spec.VolumeClaimTemplates[i].TypeMeta - existing.Spec.VolumeClaimTemplates[i].ObjectMeta = desired.Spec.VolumeClaimTemplates[i].ObjectMeta - existing.Spec.VolumeClaimTemplates[i].Spec = desired.Spec.VolumeClaimTemplates[i].Spec - } if err := mergeWithOverride(&existing.Spec.Template, desired.Spec.Template); err != nil { return err }