Skip to content

Commit

Permalink
feat(helm): Support for PVC Annotations for Non-Distributed Modes (gr…
Browse files Browse the repository at this point in the history
…afana#12023)

Signed-off-by: hfuss <[email protected]>
Co-authored-by: J Stickler <[email protected]>
Co-authored-by: Trevor Whitney <[email protected]>
  • Loading branch information
3 people authored May 23, 2024
1 parent ed32e1a commit 01129e9
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 2 deletions.
4 changes: 4 additions & 0 deletions production/helm/loki/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@ Entries should include a reference to the pull request that introduced the chang

[//]: # (<AUTOMATED_UPDATES_LOCATOR> : 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.)

## 6.6.0

- [ENHANCEMENT] Allow setting PVC annotations for all volume claim templates in simple scalable and single binary mode

## 6.5.2

- [BUGFIX] Fixed Ingress routing for all deployment modes.
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ name: loki
description: Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.
type: application
appVersion: 3.0.0
version: 6.5.2
version: 6.6.0
home: https://grafana.github.io/helm-charts
sources:
- https://github.com/grafana/loki
Expand Down
2 changes: 1 addition & 1 deletion production/helm/loki/README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# loki

![Version: 6.5.2](https://img.shields.io/badge/Version-6.5.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)
![Version: 6.6.0](https://img.shields.io/badge/Version-6.6.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 3.0.0](https://img.shields.io/badge/AppVersion-3.0.0-informational?style=flat-square)

Helm chart for Grafana Loki and Grafana Enterprise Logs supporting both simple, scalable and distributed modes.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,10 @@ spec:
kind: PersistentVolumeClaim
metadata:
name: data
{{- with .Values.backend.persistence.annotations }}
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
spec:
accessModes:
- ReadWriteOnce
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/read/statefulset-read.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,10 @@ spec:
kind: PersistentVolumeClaim
metadata:
name: data
{{- with .Values.read.persistence.annotations }}
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
spec:
accessModes:
- ReadWriteOnce
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/single-binary/statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,10 @@ spec:
kind: PersistentVolumeClaim
metadata:
name: storage
{{- with .Values.singleBinary.persistence.annotations }}
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
spec:
accessModes:
- ReadWriteOnce
Expand Down
4 changes: 4 additions & 0 deletions production/helm/loki/templates/write/statefulset-write.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,10 @@ spec:
kind: PersistentVolumeClaim
metadata:
name: data
{{- with .Values.write.persistence.annotations }}
annotations:
{{- toYaml . | nindent 10 }}
{{- end }}
spec:
accessModes:
- ReadWriteOnce
Expand Down
9 changes: 9 additions & 0 deletions production/helm/loki/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1294,6 +1294,8 @@ singleBinary:
storageClass: null
# -- Selector for persistent disk
selector: null
# -- Annotations for volume claim
annotations: {}
######################################################################################################################
#
# Simple Scalable Deployment (SSD) Mode
Expand Down Expand Up @@ -1421,6 +1423,8 @@ write:
storageClass: null
# -- Selector for persistent disk
selector: null
# -- Annotations for volume claim
annotations: {}
# -- Configuration for the read pod(s)
read:
# -- Number of replicas for the read
Expand Down Expand Up @@ -1528,6 +1532,8 @@ read:
storageClass: null
# -- Selector for persistent disk
selector: null
# -- Annotations for volume claim
annotations: {}
# -- Configuration for the backend pod(s)
backend:
# -- Number of replicas for the backend
Expand Down Expand Up @@ -1636,6 +1642,8 @@ backend:
storageClass: null
# -- Selector for persistent disk
selector: null
# -- Annotations for volume claim
annotations: {}
######################################################################################################################
#
# Microservices Mode
Expand Down Expand Up @@ -3091,6 +3099,7 @@ minio:
purge: false
persistence:
size: 5Gi
annotations: {}
resources:
requests:
cpu: 100m
Expand Down

0 comments on commit 01129e9

Please sign in to comment.