From e5507337fad38ab4773dc4a8bb851789582c8321 Mon Sep 17 00:00:00 2001 From: Gian Vetter Date: Fri, 27 Mar 2026 12:09:58 +0100 Subject: [PATCH 1/3] fix(alertmanager, compactor, ingester, store-gateway): add apiVersion and kind to volumeClaimTemplates Signed-off-by: Gian Vetter --- templates/alertmanager/alertmanager-statefulset.yaml | 4 +++- templates/compactor/compactor-statefulset.yaml | 4 +++- templates/ingester/ingester-statefulset.yaml | 4 +++- templates/store-gateway/store-gateway-statefulset.yaml | 4 +++- 4 files changed, 12 insertions(+), 4 deletions(-) diff --git a/templates/alertmanager/alertmanager-statefulset.yaml b/templates/alertmanager/alertmanager-statefulset.yaml index c0be57db..265b0162 100644 --- a/templates/alertmanager/alertmanager-statefulset.yaml +++ b/templates/alertmanager/alertmanager-statefulset.yaml @@ -28,7 +28,9 @@ spec: {{- end }} {{- end }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: storage {{- if .Values.alertmanager.persistentVolume.annotations }} annotations: diff --git a/templates/compactor/compactor-statefulset.yaml b/templates/compactor/compactor-statefulset.yaml index 1186746f..6621c705 100644 --- a/templates/compactor/compactor-statefulset.yaml +++ b/templates/compactor/compactor-statefulset.yaml @@ -25,7 +25,9 @@ spec: {{- end }} {{- end }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: storage {{- if .Values.compactor.persistentVolume.annotations }} annotations: diff --git a/templates/ingester/ingester-statefulset.yaml b/templates/ingester/ingester-statefulset.yaml index b6d37ae2..fb3a931e 100644 --- a/templates/ingester/ingester-statefulset.yaml +++ b/templates/ingester/ingester-statefulset.yaml @@ -28,7 +28,9 @@ spec: {{- end }} {{- end }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: storage {{- if .Values.ingester.persistentVolume.annotations }} annotations: diff --git a/templates/store-gateway/store-gateway-statefulset.yaml b/templates/store-gateway/store-gateway-statefulset.yaml index 35746d6a..309a935b 100644 --- a/templates/store-gateway/store-gateway-statefulset.yaml +++ b/templates/store-gateway/store-gateway-statefulset.yaml @@ -28,7 +28,9 @@ spec: {{- end }} {{- end }} volumeClaimTemplates: - - metadata: + - apiVersion: v1 + kind: PersistentVolumeClaim + metadata: name: storage {{- if .Values.store_gateway.persistentVolume.annotations }} annotations: From ee83f89bc78d0a5d45ff7329f2d3e7754476409d Mon Sep 17 00:00:00 2001 From: Gian Vetter Date: Fri, 27 Mar 2026 12:15:06 +0100 Subject: [PATCH 2/3] fix(changelog): add bugfix entry for apiVersion and kind fields in volumeClaimTemplates to prevent ArgoCD sync flapping Signed-off-by: Gian Vetter --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 68fb5ec1..3e108982 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ## master / unreleased +* [BUGFIX] Add `apiVersion` and `kind` fields to `volumeClaimTemplates` in StatefulSets to prevent ArgoCD sync flapping # + ## 3.2.0 / 2026-02-26 * [ENHANCEMENT] enable readiness probe on kiwigrid/k8s-sidecar #597 From 4566dd16739a7a9fba4dac805ee60c4b9d09c4f1 Mon Sep 17 00:00:00 2001 From: Gian Vetter Date: Fri, 27 Mar 2026 12:19:43 +0100 Subject: [PATCH 3/3] fix(changelog): update bugfix entry for apiVersion and kind fields in volumeClaimTemplates to include PR number Signed-off-by: Gian Vetter --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3e108982..bd09f48c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,7 +2,7 @@ ## master / unreleased -* [BUGFIX] Add `apiVersion` and `kind` fields to `volumeClaimTemplates` in StatefulSets to prevent ArgoCD sync flapping # +* [BUGFIX] Add `apiVersion` and `kind` fields to `volumeClaimTemplates` in StatefulSets to prevent ArgoCD sync flapping #608 ## 3.2.0 / 2026-02-26