From f333fb799ae66a5e665ecd6df15bc72d8b535c61 Mon Sep 17 00:00:00 2001 From: dkarnutsch Date: Fri, 1 Feb 2019 23:07:48 +0100 Subject: [PATCH] make chnange of ownership on init optional (#11061) Signed-off-by: Daniel Karnutsch --- stable/grafana/Chart.yaml | 2 +- stable/grafana/README.md | 1 + stable/grafana/templates/deployment.yaml | 2 +- stable/grafana/values.yaml | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/stable/grafana/Chart.yaml b/stable/grafana/Chart.yaml index 1cfef8b772..ed591ed5b6 100755 --- a/stable/grafana/Chart.yaml +++ b/stable/grafana/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: grafana -version: 1.25.4 +version: 1.26.0 appVersion: 5.4.3 kubeVersion: "^1.8.0-0" description: The leading tool for querying and visualizing time series and metrics. diff --git a/stable/grafana/README.md b/stable/grafana/README.md index a172c84fa1..5981a7b5fb 100644 --- a/stable/grafana/README.md +++ b/stable/grafana/README.md @@ -54,6 +54,7 @@ The command removes all the Kubernetes components associated with the chart and | `tolerations` | Toleration labels for pod assignment | `[]` | | `affinity` | Affinity settings for pod assignment | `{}` | | `persistence.enabled` | Use persistent volume to store data | `false` | +| `persistence.initChownData` | Change ownership of persistent volume on initialization | `true` | | `persistence.size` | Size of persistent volume claim | `10Gi` | | `persistence.existingClaim` | Use an existing PVC to persist data | `nil` | | `persistence.storageClassName` | Type of persistent volume claim | `nil` | diff --git a/stable/grafana/templates/deployment.yaml b/stable/grafana/templates/deployment.yaml index ebaf405114..dc594fe23c 100644 --- a/stable/grafana/templates/deployment.yaml +++ b/stable/grafana/templates/deployment.yaml @@ -46,7 +46,7 @@ spec: {{- if ( or .Values.persistence.enabled .Values.dashboards ) }} initContainers: {{- end }} -{{- if .Values.persistence.enabled }} +{{- if ( and .Values.persistence.enabled .Values.persistence.initChownData ) }} - name: init-chown-data image: "{{ .Values.chownDataImage.repository }}:{{ .Values.chownDataImage.tag }}" imagePullPolicy: {{ .Values.chownDataImage.pullPolicy }} diff --git a/stable/grafana/values.yaml b/stable/grafana/values.yaml index c16a4f9cfd..7727c00cff 100644 --- a/stable/grafana/values.yaml +++ b/stable/grafana/values.yaml @@ -119,6 +119,7 @@ affinity: {} ## persistence: enabled: false + initChownData: true # storageClassName: default accessModes: - ReadWriteOnce