Skip to content

Commit 3c71c83

Browse files
authored
fix(helm): Fix statefulset templates to not show diffs in ArgoCD (#15192)
1 parent e5bc43b commit 3c71c83

File tree

12 files changed

+36
-13
lines changed

12 files changed

+36
-13
lines changed

‎production/helm/loki/CHANGELOG.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ Entries should include a reference to the pull request that introduced the chang
1818
- [CHANGE] Changed version of Grafana Loki to 3.3.1
1919
- [CHANGE] Changed version of Minio helm chart to 5.3.0 (#14834)
2020
- [BUGFIX] Add default wal dir to ruler config ([#14920](https://github.com/grafana/loki/pull/14920))
21+
- [FIX] Fix statefulset templates to not show diffs in ArgoCD
2122

2223
## 6.22.0
2324

@@ -107,7 +108,7 @@ Entries should include a reference to the pull request that introduced the chang
107108
## 6.7.3
108109

109110
- [BUGFIX] Removed Helm test binary
110-
111+
111112
## 6.7.2
112113

113114
- [BUGFIX] Fix imagePullSecrets for statefulset-results-cache

‎production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ spec:
161161
{{- if .Values.bloomGateway.persistence.enabled }}
162162
volumeClaimTemplates:
163163
{{- range .Values.bloomGateway.persistence.claims }}
164-
- metadata:
164+
- apiVersion: v1
165+
kind: PersistentVolumeClaim
166+
metadata:
165167
name: {{ .name }}
166168
{{- with .annotations }}
167169
annotations:

‎production/helm/loki/templates/bloom-planner/statefulset-bloom-planner.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ spec:
161161
{{- if .Values.bloomPlanner.persistence.enabled }}
162162
volumeClaimTemplates:
163163
{{- range .Values.bloomPlanner.persistence.claims }}
164-
- metadata:
164+
- apiVersion: v1
165+
kind: PersistentVolumeClaim
166+
metadata:
165167
name: {{ .name }}
166168
{{- with .annotations }}
167169
annotations:

‎production/helm/loki/templates/compactor/statefulset-compactor.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ spec:
173173
{{- if .Values.compactor.persistence.enabled }}
174174
volumeClaimTemplates:
175175
{{- range .Values.compactor.persistence.claims }}
176-
- metadata:
176+
- apiVersion: v1
177+
kind: PersistentVolumeClaim
178+
metadata:
177179
name: {{ .name }}
178180
{{- with .annotations }}
179181
annotations:

‎production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,9 @@ spec:
173173
{{- end }}
174174
{{- else }}
175175
volumeClaimTemplates:
176-
- metadata:
176+
- apiVersion: v1
177+
kind: PersistentVolumeClaim
178+
metadata:
177179
name: data
178180
{{- with .Values.indexGateway.persistence.annotations }}
179181
annotations:

‎production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ spec:
214214
{{- else }}
215215
volumeClaimTemplates:
216216
{{- range .Values.ingester.persistence.claims }}
217-
- metadata:
217+
- apiVersion: v1
218+
kind: PersistentVolumeClaim
219+
metadata:
218220
name: {{ .name }}
219221
{{- with .annotations }}
220222
annotations:

‎production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ spec:
214214
{{- else }}
215215
volumeClaimTemplates:
216216
{{- range .Values.ingester.persistence.claims }}
217-
- metadata:
217+
- apiVersion: v1
218+
kind: PersistentVolumeClaim
219+
metadata:
218220
name: {{ .name }}
219221
{{- with .annotations }}
220222
annotations:

‎production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -214,7 +214,9 @@ spec:
214214
{{- else }}
215215
volumeClaimTemplates:
216216
{{- range .Values.ingester.persistence.claims }}
217-
- metadata:
217+
- apiVersion: v1
218+
kind: PersistentVolumeClaim
219+
metadata:
218220
name: {{ .name }}
219221
{{- with .annotations }}
220222
annotations:

‎production/helm/loki/templates/ingester/statefulset-ingester.yaml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,9 @@ spec:
185185
{{- else }}
186186
volumeClaimTemplates:
187187
{{- range .Values.ingester.persistence.claims }}
188-
- metadata:
188+
- apiVersion: v1
189+
kind: PersistentVolumeClaim
190+
metadata:
189191
name: {{ .name }}
190192
{{- with .annotations }}
191193
annotations:

‎production/helm/loki/templates/memcached/_memcached-statefulset.tpl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,9 @@ spec:
161161
{{- end }}
162162
{{- if .persistence.enabled }}
163163
volumeClaimTemplates:
164-
- metadata:
164+
- apiVersion: v1
165+
kind: PersistentVolumeClaim
166+
metadata:
165167
name: data
166168
spec:
167169
accessModes: [ "ReadWriteOnce" ]

0 commit comments

Comments
 (0)