From bb72e643f2bf6558c8ddb2a7de01c120fae20666 Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Fri, 3 Feb 2017 16:51:44 -0500 Subject: [PATCH] [stable/prometheus] Update to the recommended pvc patterns. (#463) * Convert chart prometheus to use the recommended pvc patterns * rebase and fix truncation in pvc conditional * bump chart version --- stable/prometheus/Chart.yaml | 2 +- stable/prometheus/templates/alertmanager-pvc.yaml | 6 +++--- stable/prometheus/templates/server-pvc.yaml | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/stable/prometheus/Chart.yaml b/stable/prometheus/Chart.yaml index 85f6b5b6cb..c05a709f03 100755 --- a/stable/prometheus/Chart.yaml +++ b/stable/prometheus/Chart.yaml @@ -1,5 +1,5 @@ name: prometheus -version: 2.0.2 +version: 2.0.3 description: A Prometheus Helm chart for Kubernetes. Prometheus is a monitoring system and time series database. home: https://prometheus.io/ sources: diff --git a/stable/prometheus/templates/alertmanager-pvc.yaml b/stable/prometheus/templates/alertmanager-pvc.yaml index a363123b30..39d740c3fa 100644 --- a/stable/prometheus/templates/alertmanager-pvc.yaml +++ b/stable/prometheus/templates/alertmanager-pvc.yaml @@ -4,9 +4,9 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - {{- if .Values.alertmanager.persistentVolume.storageClass }} - volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass }} - {{ else }} + {{- if .Values.alertmanager.persistentVolume.storageClass | quote }} + volume.beta.kubernetes.io/storage-class: {{ .Values.alertmanager.persistentVolume.storageClass | quote }} + {{- else }} volume.alpha.kubernetes.io/storage-class: default {{- end }} {{- range $key, $value := .Values.alertmanager.persistentVolume.annotations }} diff --git a/stable/prometheus/templates/server-pvc.yaml b/stable/prometheus/templates/server-pvc.yaml index ef10be6cc9..9db2dfa857 100644 --- a/stable/prometheus/templates/server-pvc.yaml +++ b/stable/prometheus/templates/server-pvc.yaml @@ -4,9 +4,9 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: annotations: - {{- if .Values.server.persistentVolume.storageClass }} - volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass }} - {{ else }} + {{- if .Values.server.persistentVolume.storageClass | quote }} + volume.beta.kubernetes.io/storage-class: {{ .Values.server.persistentVolume.storageClass | quote }} + {{- else }} volume.alpha.kubernetes.io/storage-class: default {{- end }} {{- range $key, $value := .Values.server.persistentVolume.annotations }}