diff --git a/docs/sources/setup/install/helm/reference.md b/docs/sources/setup/install/helm/reference.md
index c565cec8fd..6e2a929027 100644
--- a/docs/sources/setup/install/helm/reference.md
+++ b/docs/sources/setup/install/helm/reference.md
@@ -372,6 +372,7 @@ This is the generated reference for the Loki Helm Chart values.
"emptyDir": {}
},
"enableStatefulSetAutoDeletePVC": true,
+ "labels": {},
"selector": null,
"size": "10Gi",
"storageClass": null,
@@ -603,6 +604,15 @@ null
true
+ |
+
+
+ | backend.persistence.labels |
+ object |
+ Labels for volume claim |
+
+{}
+
|
@@ -1180,6 +1190,7 @@ null
],
"enableStatefulSetAutoDeletePVC": false,
"enabled": false,
+ "labels": {},
"whenDeleted": "Retain",
"whenScaled": "Retain"
},
@@ -1393,6 +1404,15 @@ false
false
+ |
+
+
+ | bloomGateway.persistence.labels |
+ object |
+ Labels for bloom gateway PVCs |
+
+{}
+
|
@@ -1561,9 +1581,10 @@ null
"livenessProbe": {},
"nodeSelector": {},
"persistence": {
- "annotations": {},
"claims": [
{
+ "annotations": {},
+ "labels": {},
"name": "data",
"size": "10Gi",
"storageClass": null
@@ -1742,7 +1763,16 @@ null
- | bloomPlanner.persistence.annotations |
+ bloomPlanner.persistence.claims |
+ list |
+ List of the bloom-planner PVCs |
+
+
+
+ |
+
+
+ | bloomPlanner.persistence.claims[0].annotations |
object |
Annotations for bloom-planner PVCs |
@@ -1751,11 +1781,11 @@ null
|
- | bloomPlanner.persistence.claims |
- list |
- List of the bloom-planner PVCs |
-
-
+ | bloomPlanner.persistence.claims[0].labels |
+ object |
+ Labels for bloom planner PVCs |
+
+{}
|
|
@@ -2770,9 +2800,10 @@ null
"livenessProbe": {},
"nodeSelector": {},
"persistence": {
- "annotations": {},
"claims": [
{
+ "annotations": {},
+ "labels": {},
"name": "data",
"size": "10Gi",
"storageClass": null
@@ -2953,7 +2984,16 @@ null
- | compactor.persistence.annotations |
+ compactor.persistence.claims |
+ list |
+ List of the compactor PVCs |
+
+
+
+ |
+
+
+ | compactor.persistence.claims[0].annotations |
object |
Annotations for compactor PVCs |
@@ -2962,11 +3002,11 @@ null
|
- | compactor.persistence.claims |
- list |
- List of the compactor PVCs |
-
-
+ | compactor.persistence.claims[0].labels |
+ object |
+ Labels for compactor PVCs |
+
+{}
|
|
@@ -5278,6 +5318,7 @@ null
"enableStatefulSetAutoDeletePVC": false,
"enabled": false,
"inMemory": false,
+ "labels": {},
"size": "10Gi",
"storageClass": null,
"whenDeleted": "Retain",
@@ -5480,6 +5521,15 @@ false
false
+ |
+
+
+ | indexGateway.persistence.labels |
+ object |
+ Labels for index gateway PVCs |
+
+{}
+
|
@@ -8712,9 +8762,10 @@ null
"maxUnavailable": null,
"nodeSelector": {},
"persistence": {
- "annotations": {},
"claims": [
{
+ "annotations": {},
+ "labels": {},
"name": "data",
"size": "10Gi",
"storageClass": null
@@ -8905,7 +8956,16 @@ null
- | patternIngester.persistence.annotations |
+ patternIngester.persistence.claims |
+ list |
+ List of the pattern ingester PVCs |
+
+
+
+ |
+
+
+ | patternIngester.persistence.claims[0].annotations |
object |
Annotations for pattern ingester PVCs |
@@ -8914,11 +8974,11 @@ null
|
- | patternIngester.persistence.claims |
- list |
- List of the pattern ingester PVCs |
-
-
+ | patternIngester.persistence.claims[0].labels |
+ object |
+ Labels for pattern ingester PVCs |
+
+{}
|
|
@@ -9147,12 +9207,6 @@ null
"maxSurge": 0,
"maxUnavailable": null,
"nodeSelector": {},
- "persistence": {
- "annotations": {},
- "enabled": false,
- "size": "10Gi",
- "storageClass": null
- },
"podAnnotations": {},
"podLabels": {},
"priorityClassName": null,
@@ -9430,42 +9484,6 @@ null
{}
- |
-
-
- | querier.persistence.annotations |
- object |
- Annotations for querier PVCs |
-
-{}
-
- |
-
-
- | querier.persistence.enabled |
- bool |
- Enable creating PVCs for the querier cache |
-
-false
-
- |
-
-
- | querier.persistence.size |
- string |
- Size of persistent disk |
-
-"10Gi"
-
- |
-
-
- | querier.persistence.storageClass |
- string |
- Storage class to be used. If defined, storageClassName: . If set to "-", storageClassName: "", which disables dynamic provisioning. If empty or set to null, no storageClassName spec is set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack). |
-
-null
-
|
@@ -10302,6 +10320,7 @@ false
"persistence": {
"annotations": {},
"enableStatefulSetAutoDeletePVC": true,
+ "labels": {},
"selector": null,
"size": "10Gi",
"storageClass": null
@@ -10531,6 +10550,7 @@ false
{
"annotations": {},
"enableStatefulSetAutoDeletePVC": true,
+ "labels": {},
"selector": null,
"size": "10Gi",
"storageClass": null
@@ -10554,6 +10574,15 @@ false
true
+ |
+
+
+ | read.persistence.labels |
+ object |
+ Labels for volume claim |
+
+{}
+
|
@@ -11144,6 +11173,7 @@ null
"persistence": {
"annotations": {},
"enabled": false,
+ "labels": {},
"size": "10Gi",
"storageClass": null
},
@@ -11351,6 +11381,15 @@ null
false
+ |
+
+
+ | ruler.persistence.labels |
+ object |
+ Labels for ruler PVCs |
+
+{}
+
|
@@ -11935,6 +11974,15 @@ true
true
+ |
+
+
+ | singleBinary.persistence.labels |
+ object |
+ Labels for volume claim |
+
+{}
+
|
@@ -12730,6 +12778,15 @@ null
false
+ |
+
+
+ | write.persistence.labels |
+ object |
+ Labels for volume claim |
+
+{}
+
|
diff --git a/production/helm/loki/CHANGELOG.md b/production/helm/loki/CHANGELOG.md
index a051cb61fc..dab23d1e99 100644
--- a/production/helm/loki/CHANGELOG.md
+++ b/production/helm/loki/CHANGELOG.md
@@ -13,9 +13,9 @@ Entries should include a reference to the pull request that introduced the chang
[//]: # ( : do not remove this line. This locator is used by the CI pipeline to automatically create a changelog entry for each new Loki release. Add other chart versions and respective changelog entries bellow this line.)
+- [FEATURE] Expose labels on volumeClaimTemplates [#13317](https://github.com/grafana/loki/pull/13317)
- [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the backend pods. [#18547](https://github.com/grafana/loki/pull/18547)
- [ENHANCEMENT] Add configurable `startupProbe` to the loki-sc-rules sidecar container in the single-binary pods. [#18547](https://github.com/grafana/loki/pull/18547)
-- [ENHANCEMENT] Add configurable `livenessProbe` and `startupProbe` for admin-api. [#18546](https://github.com/grafana/loki/pull/18546)
- [BUGFIX] Add validation for loki.storage.bucketNames [#13781](https://github.com/grafana/loki/pull/13781)
- [BUGFIX] Create missing RBAC for the rules sidecar when RBAC is namespaced
- [FEATURE] Allow setting custom labels for ingester statefulsets [#18536](https://github.com/grafana/loki/pull/18536)
diff --git a/production/helm/loki/templates/backend/statefulset-backend.yaml b/production/helm/loki/templates/backend/statefulset-backend.yaml
index 90f6339fdc..cf31a75248 100644
--- a/production/helm/loki/templates/backend/statefulset-backend.yaml
+++ b/production/helm/loki/templates/backend/statefulset-backend.yaml
@@ -273,6 +273,10 @@ spec:
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
+ {{- with .Values.backend.persistence.labels }}
+ labels:
+ {{- toYaml . | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml
index 9da0f9f67b..39f12e4be4 100644
--- a/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml
+++ b/production/helm/loki/templates/bloom-gateway/statefulset-bloom-gateway.yaml
@@ -166,6 +166,10 @@ spec:
annotations:
{{- . | toYaml | nindent 10 }}
{{- end }}
+ {{- with .labels }}
+ labels:
+ {{- . | toYaml | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/compactor/statefulset-compactor.yaml b/production/helm/loki/templates/compactor/statefulset-compactor.yaml
index b0a4969c56..ad09d377d3 100644
--- a/production/helm/loki/templates/compactor/statefulset-compactor.yaml
+++ b/production/helm/loki/templates/compactor/statefulset-compactor.yaml
@@ -178,6 +178,10 @@ spec:
annotations:
{{- . | toYaml | nindent 10 }}
{{- end }}
+ {{- with .labels }}
+ labels:
+ {{- . | toYaml | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml
index 0a725e9412..e76df9f589 100644
--- a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml
+++ b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml
@@ -178,6 +178,10 @@ spec:
annotations:
{{- . | toYaml | nindent 10 }}
{{- end }}
+ {{- with .Values.indexGateway.persistence.labels }}
+ labels:
+ {{- . | toYaml | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml b/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml
index 7756b4039e..462b88b27b 100644
--- a/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml
+++ b/production/helm/loki/templates/pattern-ingester/statefulset-pattern-ingester.yaml
@@ -171,6 +171,10 @@ spec:
annotations:
{{- . | toYaml | nindent 10 }}
{{- end }}
+ {{- with .labels }}
+ labels:
+ {{- . | toYaml | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/read/statefulset-read.yaml b/production/helm/loki/templates/read/statefulset-read.yaml
index d2f440c213..ff2218a3f3 100644
--- a/production/helm/loki/templates/read/statefulset-read.yaml
+++ b/production/helm/loki/templates/read/statefulset-read.yaml
@@ -182,6 +182,10 @@ spec:
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
+ {{- with .Values.read.persistence.labels }}
+ labels:
+ {{- toYaml . | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/ruler/statefulset-ruler.yaml b/production/helm/loki/templates/ruler/statefulset-ruler.yaml
index 36581f9e29..be8fcf1b7f 100644
--- a/production/helm/loki/templates/ruler/statefulset-ruler.yaml
+++ b/production/helm/loki/templates/ruler/statefulset-ruler.yaml
@@ -253,6 +253,10 @@ spec:
annotations:
{{- . | toYaml | nindent 10 }}
{{- end }}
+ {{- with .Values.ruler.persistence.labels }}
+ labels:
+ {{- . | toYaml | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/single-binary/statefulset.yaml b/production/helm/loki/templates/single-binary/statefulset.yaml
index c0189d2edd..56bf3f941a 100644
--- a/production/helm/loki/templates/single-binary/statefulset.yaml
+++ b/production/helm/loki/templates/single-binary/statefulset.yaml
@@ -266,6 +266,10 @@ spec:
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
+ {{- with .Values.singleBinary.persistence.labels }}
+ labels:
+ {{- toYaml . | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/templates/write/statefulset-write.yaml b/production/helm/loki/templates/write/statefulset-write.yaml
index 06f45a98e9..1edf099b09 100644
--- a/production/helm/loki/templates/write/statefulset-write.yaml
+++ b/production/helm/loki/templates/write/statefulset-write.yaml
@@ -191,6 +191,10 @@ spec:
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
+ {{- with .Values.write.persistence.labels }}
+ labels:
+ {{- toYaml . | nindent 10 }}
+ {{- end }}
spec:
accessModes:
- ReadWriteOnce
diff --git a/production/helm/loki/values.yaml b/production/helm/loki/values.yaml
index 6525a10333..3e74bb77c4 100644
--- a/production/helm/loki/values.yaml
+++ b/production/helm/loki/values.yaml
@@ -1500,6 +1500,8 @@ singleBinary:
selector: null
# -- Annotations for volume claim
annotations: {}
+ # -- Labels for volume claim
+ labels: {}
######################################################################################################################
#
# Simple Scalable Deployment (SSD) Mode
@@ -1629,6 +1631,8 @@ write:
selector: null
# -- Annotations for volume claim
annotations: {}
+ # -- Labels for volume claim
+ labels: {}
# -- Configuration for the read pod(s)
read:
# -- Number of replicas for the read
@@ -1741,6 +1745,8 @@ read:
selector: null
# -- Annotations for volume claim
annotations: {}
+ # -- Labels for volume claim
+ labels: {}
# -- Configuration for the backend pod(s)
backend:
# -- Number of replicas for the backend
@@ -1853,6 +1859,8 @@ backend:
selector: null
# -- Annotations for volume claim
annotations: {}
+ # -- Labels for volume claim
+ labels: {}
######################################################################################################################
#
# Microservices Mode
@@ -2250,19 +2258,6 @@ querier:
tolerations: []
# -- DNSConfig for querier pods
dnsConfig: {}
- persistence:
- # -- Enable creating PVCs for the querier cache
- enabled: false
- # -- Size of persistent disk
- size: 10Gi
- # -- Storage class to be used.
- # If defined, storageClassName: .
- # If set to "-", storageClassName: "", which disables dynamic provisioning.
- # If empty or set to null, no storageClassName spec is
- # set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
- storageClass: null
- # -- Annotations for querier PVCs
- annotations: {}
# -- Adds the appProtocol field to the querier service. This allows querier to work with istio protocol selection.
appProtocol:
# -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
@@ -2501,6 +2496,8 @@ indexGateway:
storageClass: null
# -- Annotations for index gateway PVCs
annotations: {}
+ # -- Labels for index gateway PVCs
+ labels: {}
# -- Enable StatefulSetAutoDeletePVC feature
enableStatefulSetAutoDeletePVC: false
whenDeleted: Retain
@@ -2592,8 +2589,6 @@ compactor:
# If empty or set to null, no storageClassName spec is
# set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
storageClass: null
- # -- Annotations for compactor PVCs
- annotations: {}
# -- List of the compactor PVCs
# @notationType -- list
claims:
@@ -2605,6 +2600,10 @@ compactor:
# If empty or set to null, no storageClassName spec is
# set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
storageClass: null
+ # -- Annotations for compactor PVCs
+ annotations: {}
+ # -- Labels for compactor PVCs
+ labels: {}
# - name: wal
# size: 150Gi
# -- Enable StatefulSetAutoDeletePVC feature
@@ -2694,6 +2693,8 @@ bloomGateway:
enabled: false
# -- Annotations for bloom-gateway PVCs
annotations: {}
+ # -- Labels for bloom gateway PVCs
+ labels: {}
# -- List of the bloom-gateway PVCs
# @notationType -- list
claims:
@@ -2791,8 +2792,6 @@ bloomPlanner:
persistence:
# -- Enable creating PVCs for the bloom-planner
enabled: false
- # -- Annotations for bloom-planner PVCs
- annotations: {}
# -- List of the bloom-planner PVCs
# @notationType -- list
claims:
@@ -2805,6 +2804,10 @@ bloomPlanner:
# If empty or set to null, no storageClassName spec is
# set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
storageClass: null
+ # -- Annotations for bloom-planner PVCs
+ annotations: {}
+ # -- Labels for bloom planner PVCs
+ labels: {}
# -- Enable StatefulSetAutoDeletePVC feature
enableStatefulSetAutoDeletePVC: false
whenDeleted: Retain
@@ -2992,8 +2995,6 @@ patternIngester:
# If empty or set to null, no storageClassName spec is
# set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
storageClass: null
- # -- Annotations for pattern ingester PVCs
- annotations: {}
# -- List of the pattern ingester PVCs
# @notationType -- list
claims:
@@ -3005,6 +3006,10 @@ patternIngester:
# If empty or set to null, no storageClassName spec is
# set, choosing the default provisioner (gp2 on AWS, standard on GKE, AWS, and OpenStack).
storageClass: null
+ # -- Annotations for pattern ingester PVCs
+ annotations: {}
+ # -- Labels for pattern ingester PVCs
+ labels: {}
# - name: wal
# size: 150Gi
# -- Enable StatefulSetAutoDeletePVC feature
@@ -3105,6 +3110,8 @@ ruler:
storageClass: null
# -- Annotations for ruler PVCs
annotations: {}
+ # -- Labels for ruler PVCs
+ labels: {}
# -- Set the optional grpc service protocol. Ex: "grpc", "http2" or "https"
appProtocol:
grpc: ""