diff --git a/charts/grafana/Chart.yaml b/charts/grafana/Chart.yaml index 351040ab51..32ba32bafc 100644 --- a/charts/grafana/Chart.yaml +++ b/charts/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: grafana -version: 10.5.6 +version: 10.5.7 appVersion: 12.3.1 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/charts/grafana/README.md b/charts/grafana/README.md index dbecb0318f..8ade8bf01e 100644 --- a/charts/grafana/README.md +++ b/charts/grafana/README.md @@ -124,6 +124,7 @@ This ensures the expressions are preserved for Alertmanager instead of being ren | `persistence.type` | Type of persistence (`pvc` or `statefulset`) | `pvc` | | `persistence.size` | Size of persistent volume claim | `10Gi` | | `persistence.existingClaim` | Use an existing PVC to persist data (can be templated) | `nil` | +| `persistence.volumeName` | If using a PVC, then use a specific PV name | `nil` | | `persistence.storageClassName` | Type of persistent volume claim | `nil` | | `persistence.accessModes` | Persistence access modes | `[ReadWriteOnce]` | | `persistence.annotations` | PersistentVolumeClaim annotations | `{}` | diff --git a/charts/grafana/templates/pvc.yaml b/charts/grafana/templates/pvc.yaml index d1c4b2de27..992212582c 100644 --- a/charts/grafana/templates/pvc.yaml +++ b/charts/grafana/templates/pvc.yaml @@ -25,7 +25,9 @@ spec: resources: requests: storage: {{ .Values.persistence.size | quote }} - {{- if and (.Values.persistence.lookupVolumeName) (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }} + {{- if .Values.persistence.volumeName }} + volumeName: {{ .Values.persistence.volumeName }} + {{- else if and (.Values.persistence.lookupVolumeName) (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)) }} volumeName: {{ (lookup "v1" "PersistentVolumeClaim" (include "grafana.namespace" .) (include "grafana.fullname" .)).spec.volumeName }} {{- end }} {{- with .Values.persistence.storageClassName }}