Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

## master / unreleased

* [BUGFIX] Add `apiVersion` and `kind` fields to `volumeClaimTemplates` in StatefulSets to prevent ArgoCD sync flapping #608

## 3.2.0 / 2026-02-26

* [ENHANCEMENT] enable readiness probe on kiwigrid/k8s-sidecar #597
Expand Down
4 changes: 3 additions & 1 deletion templates/alertmanager/alertmanager-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ spec:
{{- end }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
Comment on lines +31 to +33
Copy link
Copy Markdown
Collaborator

@kd7lxl kd7lxl Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The official docs do not include the apiVersion and kind fields in the volumeClaimTemplate: https://kubernetes.io/docs/concepts/workloads/controllers/statefulset/#components

  volumeClaimTemplates:
  - metadata:
      name: www

The drift you are seeing is a bug in ArgoCD, not in this chart.

Copy link
Copy Markdown
Author

@gianvetter gianvetter Mar 27, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're absolutely correct that it's technically an ArgoCD bug.

However, this issue has been open for 3 years (argoproj/argo-cd#16707), and many widely-used charts have already added this workaround to prevent constant drift warnings for ArgoCD users.

For example:

I'd prefer to align this chart with how other charts handle it to improve the experience for ArgoCD users. What do you think?

If you don't think this change is necessary, I can also set up an ignore diff in ArgoCD. That works for me too.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer to keep usage here inline with the official docs. I welcome other opinions on this topic if anyone else wants to voice them. In the short term, I recommend adding the ignore diff workaround or deploying a fork of this chart.

name: storage
{{- if .Values.alertmanager.persistentVolume.annotations }}
annotations:
Expand Down
4 changes: 3 additions & 1 deletion templates/compactor/compactor-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ spec:
{{- end }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: storage
{{- if .Values.compactor.persistentVolume.annotations }}
annotations:
Expand Down
4 changes: 3 additions & 1 deletion templates/ingester/ingester-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ spec:
{{- end }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: storage
{{- if .Values.ingester.persistentVolume.annotations }}
annotations:
Expand Down
4 changes: 3 additions & 1 deletion templates/store-gateway/store-gateway-statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ spec:
{{- end }}
{{- end }}
volumeClaimTemplates:
- metadata:
- apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: storage
{{- if .Values.store_gateway.persistentVolume.annotations }}
annotations:
Expand Down