Skip to content

Commit 06da42a

Browse files
matt-veitas-ebJSticklerJayclifford345
authored
fix(helm): Enable volumeAttributesClassName attributes for volumeClaimTemplates (#19719)
Signed-off-by: Jay Clifford <[email protected]> Signed-off-by: J Stickler <[email protected]> Co-authored-by: J Stickler <[email protected]> Co-authored-by: Jay Clifford <[email protected]>
1 parent 91d4eb6 commit 06da42a

17 files changed

+240
-14
lines changed

‎docs/sources/setup/install/helm/reference.md‎

Lines changed: 143 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -402,6 +402,7 @@ This is the generated reference for the Loki Helm Chart values.
402402
"selector": null,
403403
"size": "10Gi",
404404
"storageClass": null,
405+
"volumeAttributesClassName": null,
405406
"volumeClaimsEnabled": true
406407
},
407408
"podAnnotations": {},
@@ -688,6 +689,15 @@ null
688689
<td><pre lang="json">
689690
null
690691
</pre>
692+
</td>
693+
</tr>
694+
<tr>
695+
<td>backend.persistence.volumeAttributesClassName</td>
696+
<td>string</td>
697+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
698+
<td><pre lang="json">
699+
null
700+
</pre>
691701
</td>
692702
</tr>
693703
<tr>
@@ -1290,7 +1300,8 @@ null
12901300
],
12911301
"name": "data",
12921302
"size": "10Gi",
1293-
"storageClass": null
1303+
"storageClass": null,
1304+
"volumeAttributesClassName": null
12941305
}
12951306
],
12961307
"enableStatefulSetAutoDeletePVC": false,
@@ -1521,6 +1532,15 @@ null
15211532
<td><pre lang="json">
15221533
"10Gi"
15231534
</pre>
1535+
</td>
1536+
</tr>
1537+
<tr>
1538+
<td>bloomGateway.persistence.claims[0].volumeAttributesClassName</td>
1539+
<td>string</td>
1540+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
1541+
<td><pre lang="json">
1542+
null
1543+
</pre>
15241544
</td>
15251545
</tr>
15261546
<tr>
@@ -1738,7 +1758,8 @@ null
17381758
"labels": {},
17391759
"name": "data",
17401760
"size": "10Gi",
1741-
"storageClass": null
1761+
"storageClass": null,
1762+
"volumeAttributesClassName": null
17421763
}
17431764
],
17441765
"enableStatefulSetAutoDeletePVC": false,
@@ -1977,6 +1998,15 @@ null
19771998
<td><pre lang="json">
19781999
"10Gi"
19792000
</pre>
2001+
</td>
2002+
</tr>
2003+
<tr>
2004+
<td>bloomPlanner.persistence.claims[0].volumeAttributesClassName</td>
2005+
<td>string</td>
2006+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
2007+
<td><pre lang="json">
2008+
null
2009+
</pre>
19802010
</td>
19812011
</tr>
19822012
<tr>
@@ -2308,7 +2338,8 @@ true
23082338
"labels": {},
23092339
"mountPath": "/data",
23102340
"storageClass": null,
2311-
"storageSize": "10G"
2341+
"storageSize": "10G",
2342+
"volumeAttributesClassName": null
23122343
},
23132344
"podAnnotations": {},
23142345
"podLabels": {},
@@ -2535,7 +2566,8 @@ false
25352566
"labels": {},
25362567
"mountPath": "/data",
25372568
"storageClass": null,
2538-
"storageSize": "10G"
2569+
"storageSize": "10G",
2570+
"volumeAttributesClassName": null
25392571
}
25402572
</pre>
25412573
</td>
@@ -2574,6 +2606,15 @@ null
25742606
<td><pre lang="json">
25752607
"10G"
25762608
</pre>
2609+
</td>
2610+
</tr>
2611+
<tr>
2612+
<td>chunksCache.l2.persistence.volumeAttributesClassName</td>
2613+
<td>string</td>
2614+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
2615+
<td><pre lang="json">
2616+
null
2617+
</pre>
25772618
</td>
25782619
</tr>
25792620
<tr>
@@ -2780,7 +2821,8 @@ null
27802821
"labels": {},
27812822
"mountPath": "/data",
27822823
"storageClass": null,
2783-
"storageSize": "10G"
2824+
"storageSize": "10G",
2825+
"volumeAttributesClassName": null
27842826
}
27852827
</pre>
27862828
</td>
@@ -2819,6 +2861,15 @@ null
28192861
<td><pre lang="json">
28202862
"10G"
28212863
</pre>
2864+
</td>
2865+
</tr>
2866+
<tr>
2867+
<td>chunksCache.persistence.volumeAttributesClassName</td>
2868+
<td>string</td>
2869+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
2870+
<td><pre lang="json">
2871+
null
2872+
</pre>
28222873
</td>
28232874
</tr>
28242875
<tr>
@@ -3041,7 +3092,8 @@ null
30413092
"labels": {},
30423093
"name": "data",
30433094
"size": "10Gi",
3044-
"storageClass": null
3095+
"storageClass": null,
3096+
"volumeAttributesClassName": null
30453097
}
30463098
],
30473099
"enableStatefulSetAutoDeletePVC": false,
@@ -3271,6 +3323,15 @@ null
32713323
<td><pre lang="json">
32723324
{}
32733325
</pre>
3326+
</td>
3327+
</tr>
3328+
<tr>
3329+
<td>compactor.persistence.claims[0].volumeAttributesClassName</td>
3330+
<td>string</td>
3331+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
3332+
<td><pre lang="json">
3333+
null
3334+
</pre>
32743335
</td>
32753336
</tr>
32763337
<tr>
@@ -5489,6 +5550,7 @@ null
54895550
"labels": {},
54905551
"size": "10Gi",
54915552
"storageClass": null,
5553+
"volumeAttributesClassName": null,
54925554
"whenDeleted": "Retain",
54935555
"whenScaled": "Retain"
54945556
},
@@ -5756,6 +5818,15 @@ false
57565818
<td><pre lang="json">
57575819
null
57585820
</pre>
5821+
</td>
5822+
</tr>
5823+
<tr>
5824+
<td>indexGateway.persistence.volumeAttributesClassName</td>
5825+
<td>string</td>
5826+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
5827+
<td><pre lang="json">
5828+
null
5829+
</pre>
57595830
</td>
57605831
</tr>
57615832
<tr>
@@ -5954,7 +6025,8 @@ null
59546025
],
59556026
"name": "data",
59566027
"size": "10Gi",
5957-
"storageClass": null
6028+
"storageClass": null,
6029+
"volumeAttributesClassName": null
59586030
}
59596031
],
59606032
"enableStatefulSetAutoDeletePVC": false,
@@ -6315,6 +6387,15 @@ null
63156387
"ReadWriteOnce"
63166388
]
63176389
</pre>
6390+
</td>
6391+
</tr>
6392+
<tr>
6393+
<td>ingester.persistence.claims[0].volumeAttributesClassName</td>
6394+
<td>string</td>
6395+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
6396+
<td><pre lang="json">
6397+
null
6398+
</pre>
63186399
</td>
63196400
</tr>
63206401
<tr>
@@ -9283,7 +9364,8 @@ null
92839364
"labels": {},
92849365
"name": "data",
92859366
"size": "10Gi",
9286-
"storageClass": null
9367+
"storageClass": null,
9368+
"volumeAttributesClassName": null
92879369
}
92889370
],
92899371
"enableStatefulSetAutoDeletePVC": false,
@@ -9524,6 +9606,15 @@ null
95249606
<td><pre lang="json">
95259607
{}
95269608
</pre>
9609+
</td>
9610+
</tr>
9611+
<tr>
9612+
<td>patternIngester.persistence.claims[0].volumeAttributesClassName</td>
9613+
<td>string</td>
9614+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
9615+
<td><pre lang="json">
9616+
null
9617+
</pre>
95279618
</td>
95289619
</tr>
95299620
<tr>
@@ -11006,7 +11097,8 @@ false
1100611097
"labels": {},
1100711098
"selector": null,
1100811099
"size": "10Gi",
11009-
"storageClass": null
11100+
"storageClass": null,
11101+
"volumeAttributesClassName": null
1101011102
},
1101111103
"podAnnotations": {},
1101211104
"podLabels": {},
@@ -11260,7 +11352,8 @@ false
1126011352
"labels": {},
1126111353
"selector": null,
1126211354
"size": "10Gi",
11263-
"storageClass": null
11355+
"storageClass": null,
11356+
"volumeAttributesClassName": null
1126411357
}
1126511358
</pre>
1126611359
</td>
@@ -11328,6 +11421,15 @@ null
1132811421
<td><pre lang="json">
1132911422
null
1133011423
</pre>
11424+
</td>
11425+
</tr>
11426+
<tr>
11427+
<td>read.persistence.volumeAttributesClassName</td>
11428+
<td>string</td>
11429+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
11430+
<td><pre lang="json">
11431+
null
11432+
</pre>
1133111433
</td>
1133211434
</tr>
1133311435
<tr>
@@ -11646,7 +11748,8 @@ true
1164611748
"labels": {},
1164711749
"mountPath": "/data",
1164811750
"storageClass": null,
11649-
"storageSize": "10G"
11751+
"storageSize": "10G",
11752+
"volumeAttributesClassName": null
1165011753
}
1165111754
</pre>
1165211755
</td>
@@ -11694,6 +11797,15 @@ null
1169411797
<td><pre lang="json">
1169511798
"10G"
1169611799
</pre>
11800+
</td>
11801+
</tr>
11802+
<tr>
11803+
<td>resultsCache.persistence.volumeAttributesClassName</td>
11804+
<td>string</td>
11805+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
11806+
<td><pre lang="json">
11807+
null
11808+
</pre>
1169711809
</td>
1169811810
</tr>
1169911811
<tr>
@@ -11944,7 +12056,8 @@ null
1194412056
"enabled": false,
1194512057
"labels": {},
1194612058
"size": "10Gi",
11947-
"storageClass": null
12059+
"storageClass": null,
12060+
"volumeAttributesClassName": null
1194812061
},
1194912062
"podAnnotations": {},
1195012063
"podLabels": {},
@@ -12197,6 +12310,15 @@ false
1219712310
<td><pre lang="json">
1219812311
null
1219912312
</pre>
12313+
</td>
12314+
</tr>
12315+
<tr>
12316+
<td>ruler.persistence.volumeAttributesClassName</td>
12317+
<td>string</td>
12318+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
12319+
<td><pre lang="json">
12320+
null
12321+
</pre>
1220012322
</td>
1220112323
</tr>
1220212324
<tr>
@@ -13719,6 +13841,15 @@ null
1371913841
<td><pre lang="json">
1372013842
null
1372113843
</pre>
13844+
</td>
13845+
</tr>
13846+
<tr>
13847+
<td>write.persistence.volumeAttributesClassName</td>
13848+
<td>string</td>
13849+
<td>Volume attributes class name to be used. If empty or set to null, no volumeAttributesClassName spec is set. Requires Kubernetes 1.31</td>
13850+
<td><pre lang="json">
13851+
null
13852+
</pre>
1372213853
</td>
1372313854
</tr>
1372413855
<tr>

‎production/helm/loki/CHANGELOG.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,10 @@ Entries should include a reference to the pull request that introduced the chang
1313

1414
## Unreleased
1515

16-
- [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745)
17-
- [BUGFIX] Add startupProbe to read pod to go around the issue mentioned [here](https://github.com/grafana/loki/issues/15191)
1816
- [ENHANCEMENT] Use fsGroupChangePolicy=OnRootMismatch on loki to speed up pod starts [#13942](https://github.com/grafana/loki/pull/13942)
17+
- [ENHANCEMENT] Add support for configuring `volumeAttributesClassName` for `volumeClaimTemplates`. [#19719](https://github.com/grafana/loki/pull/19719)
18+
- [BUGFIX] Don't fail for missing bucket name, if minio is enabled. [#19745](https://github.com/grafana/loki/pull/19745)
19+
- [BUGFIX] Add startupProbe to read pod [#19708](https://github.com/grafana/loki/pull/19708)
1920

2021
## 6.46.0
2122

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@ spec:
295295
{{- with .Values.backend.persistence.storageClass }}
296296
storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }}
297297
{{- end }}
298+
{{- with .Values.backend.persistence.volumeAttributesClassName }}
299+
volumeAttributesClassName: {{ . }}
300+
{{- end }}
298301
resources:
299302
requests:
300303
storage: {{ .Values.backend.persistence.size | quote }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -185,6 +185,9 @@ spec:
185185
{{- with .storageClass }}
186186
storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }}
187187
{{- end }}
188+
{{- with .volumeAttributesClassName }}
189+
volumeAttributesClassName: {{ . }}
190+
{{- end }}
188191
resources:
189192
requests:
190193
storage: {{ .size | quote }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ spec:
181181
{{- with .storageClass }}
182182
storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }}
183183
{{- end }}
184+
{{- with .volumeAttributesClassName }}
185+
volumeAttributesClassName: {{ . }}
186+
{{- end }}
184187
resources:
185188
requests:
186189
storage: {{ .size | quote }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,9 @@ spec:
195195
{{- with .storageClass }}
196196
storageClassName: {{ if (eq "-" .) }}""{{ else }}{{ . }}{{ end }}
197197
{{- end }}
198+
{{- with .volumeAttributesClassName }}
199+
volumeAttributesClassName: {{ . }}
200+
{{- end }}
198201
resources:
199202
requests:
200203
storage: {{ .size | quote }}

0 commit comments

Comments
 (0)