github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/grafana] Update to the recommended pvc patterns. (#445)

Browse Source 
* Convert chart grafana to use the recommended pvc patterns

* Update Chart.yaml

* update based on recommendations
This commit is contained in:
Amanda Cameron
2017-01-30 15:32:41 -08:00
committed by Adnan Abdulhussein
parent 1b14587524
commit e2e460e3bf
5 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/grafana/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: grafana
version: 0.2.0
version: 0.2.1
description: A Helm chart for Kubernetes
home: https://grafana.net
sources:
stable/grafana/README.md
+1 -1
View File
@@ -37,6 +37,6 @@ The command removes all the Kubernetes components associated with the chart and
| `server.adminPassword` | Admin user password | admin |
| `server.persistentVolume.enabled` | Create a volume to store data | true |
| `server.persistentVolume.size` | Size of persistent volume claim | 1Gi RW |
| `server.persistentVolume.storageClass`| Type of persistent volume claim | volume.alpha.kubernetes.io/storage-class: default |
| `server.persistentVolume.storageClass`| Type of persistent volume claim | `nil` (uses alpha storage class annotation) |
| `server.persistentVolume.accessMode` | ReadWriteOnce or ReadOnly | [ReadWriteOnce] |
| `server.resources` | Server resource requests and limits | requests: {cpu: 100m, memory: 100Mi} |
stable/grafana/templates/NOTES.txt
+1 -2
View File
@@ -1,6 +1,6 @@
1. Get your '{{ .Values.server.adminUser }}' user password by running:
printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "server.fullname" . }} -o jsonpath="{.data.grafana-admin-password[*]}"`);echo
printf $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "server.fullname" . }} -o jsonpath="{.data.grafana-admin-password}" | base64 --decode);echo
2. The Grafana server can be accessed via port {{ .Values.server.httpPort }} on the following DNS name from within your cluster:
@@ -36,4 +36,3 @@
###### the Grafana pod is terminated. #####
#################################################################################
{{- end }}
stable/grafana/templates/_helpers.tpl
+4 -4
View File
@@ -3,7 +3,7 @@
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
@@ -12,7 +12,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
*/}}
{{- define "fullname" -}}
{{- $name := default "grafana" .Values.nameOverride -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
@@ -20,5 +20,5 @@ Create a fully qualified server name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "server.fullname" -}}
{{- printf "%s-%s" .Release.Name "grafana" | trunc 63 -}}
{{- end -}}
{{- printf "%s-%s" .Release.Name "grafana" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
stable/grafana/templates/pvc.yaml
+1 -1
View File
@@ -4,7 +4,7 @@ kind: PersistentVolumeClaim
metadata:
annotations:
{{- if .Values.server.persistentVolume.storageClass -}}
volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass | quote }}
{{ else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}