Update all stable PVC defs to use recommended pattern.

This changes all the various pvc.yaml files to use tha pattern shown in helm#235 This also includes a simple sed -i replacement to comment out the storageClass values in the various values.yaml
AmandaCameron · Jan 16, 2017 · fc1eb65 · fc1eb65
1 parent 56c1a4a
commit fc1eb65
Show file tree

Hide file tree

Showing 68 changed files with 370 additions and 96 deletions.
diff --git a/stable/chronograf/templates/pvc.yaml b/stable/chronograf/templates/pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
   - {{ .Values.persistence.accessMode | quote }}

diff --git a/stable/chronograf/values.yaml b/stable/chronograf/values.yaml
@@ -12,7 +12,7 @@ service:
 ## Persist data to a persitent volume
 persistence:
   enabled: false
-  storageClass: generic
+  storageClass: ""
   accessMode: ReadWriteOnce
   size: 8Gi
 

diff --git a/stable/dokuwiki/templates/apache-pvc.yaml b/stable/dokuwiki/templates/apache-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
+  {{- if .Values.persistence.apache.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.apache.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.apache.accessMode | quote }}

diff --git a/stable/dokuwiki/templates/dokuwiki-pvc.yaml b/stable/dokuwiki/templates/dokuwiki-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass | quote }}
+  {{- if .Values.persistence.dokuwiki.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.dokuwiki.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.dokuwiki.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.dokuwiki.accessMode | quote }}

diff --git a/stable/dokuwiki/values.yaml b/stable/dokuwiki/values.yaml
@@ -45,11 +45,11 @@ serviceType: LoadBalancer
 persistence:
   enabled: true
   apache:
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 1Gi
   dokuwiki:
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 

diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml
@@ -41,7 +41,7 @@ mariadb:
     ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
     ## Default: volume.alpha.kubernetes.io/storage-class: default
     ##
-    # storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -59,14 +59,14 @@ persistence:
     ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
     ## Default: volume.alpha.kubernetes.io/storage-class: default
     ##
-    # storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 1Gi
   drupal:
     ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
     ## Default: volume.alpha.kubernetes.io/storage-class: default
     ##
-    # storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 

diff --git a/stable/factorio/templates/mods-pvc.yaml b/stable/factorio/templates/mods-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - ReadWriteOnce

diff --git a/stable/factorio/templates/saves-pvc.yaml b/stable/factorio/templates/saves-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - ReadWriteOnce

diff --git a/stable/factorio/values.yaml b/stable/factorio/values.yaml
@@ -48,7 +48,7 @@ factorio:
     password: your.password
 
 persistence:
-  storageClass: generic
+  storageClass: ""
   savedGames:
     # Set this to false if you don't care to persist saved games between restarts.
     enabled: true

diff --git a/stable/ghost/templates/pvc.yaml b/stable/ghost/templates/pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

diff --git a/stable/ghost/values.yaml b/stable/ghost/values.yaml
@@ -68,7 +68,7 @@ mariadb:
   ##
   persistence:
     enabled: true
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -82,7 +82,7 @@ serviceType: LoadBalancer
 ##
 persistence:
   enabled: true
-  storageClass: generic
+  storageClass: ""
   accessMode: ReadWriteOnce
   size: 8Gi
 

diff --git a/stable/gitlab-ce/templates/data-pvc.yaml b/stable/gitlab-ce/templates/data-pvc.yaml
@@ -5,7 +5,14 @@ apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-data
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.gitlabData.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabData.accessMode | quote }}

diff --git a/stable/gitlab-ce/templates/etc-pvc.yaml b/stable/gitlab-ce/templates/etc-pvc.yaml
@@ -5,7 +5,14 @@ apiVersion: v1
 metadata:
   name: {{ template "fullname" . }}-etc
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.gitlabEtc.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.gitlabEtc.accessMode | quote }}

diff --git a/stable/gitlab-ce/values.yaml b/stable/gitlab-ce/values.yaml
@@ -48,15 +48,15 @@ persistence:
   gitlabEtc:
     enabled: true
     size: 1Gi
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
   ## This volume is used to store git data and other project files.
   ## ref: https://docs.gitlab.com/omnibus/settings/configuration.html#storing-git-data-in-an-alternative-directory
   ##
   gitlabData:
     enabled: true
     size: 10Gi
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
 
 ## Configuration values for the postgresql dependency.

diff --git a/stable/influxdb/templates/pvc.yaml b/stable/influxdb/templates/pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

diff --git a/stable/influxdb/values.yaml b/stable/influxdb/values.yaml
@@ -14,7 +14,7 @@ service:
 ## Persist data to a persitent volume
 persistence:
   enabled: false
-  storageClass: generic
+  storageClass: ""
   accessMode: ReadWriteOnce
   size: 8Gi
 

diff --git a/stable/jasperreports/templates/pvc.yaml b/stable/jasperreports/templates/pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

diff --git a/stable/jasperreports/values.yaml b/stable/jasperreports/values.yaml
@@ -49,7 +49,7 @@ mariadb:
   ##
   persistence:
     enabled: true
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -63,7 +63,7 @@ serviceType: LoadBalancer
 ##
 persistence:
   enabled: true
-  storageClass: generic
+  storageClass: ""
   accessMode: ReadWriteOnce
   size: 8Gi
 

diff --git a/stable/jenkins/templates/home-pvc.yaml b/stable/jenkins/templates/home-pvc.yaml
@@ -10,7 +10,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass | quote }}
+  {{- if .Values.Persistence.StorageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.Persistence.StorageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.Persistence.Annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.Persistence.AccessMode | quote }}

diff --git a/stable/joomla/templates/apache-pvc.yaml b/stable/joomla/templates/apache-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
+  {{- if .Values.persistence.apache.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.apache.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.apache.accessMode | quote }}

diff --git a/stable/joomla/templates/joomla-pvc.yaml b/stable/joomla/templates/joomla-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.joomla.storageClass | quote }}
+  {{- if .Values.persistence.joomla.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.joomla.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.joomla.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.joomla.accessMode | quote }}

diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml
@@ -49,7 +49,7 @@ mariadb:
   ##
   persistence:
     enabled: true
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -64,11 +64,11 @@ serviceType: LoadBalancer
 persistence:
   enabled: true
   apache:
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 1Gi
   joomla:
-    storageClass: generic
+    storageClass: ""
     accessMode: ReadWriteOnce
     size: 8Gi
 

diff --git a/stable/kapacitor/templates/pvc.yaml b/stable/kapacitor/templates/pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     app: {{ template "fullname" . }}
     name: {{ template "fullname" . }}
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.storageClass | quote }}
+  {{- if .Values.persistence.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.accessMode | quote }}

diff --git a/stable/kapacitor/values.yaml b/stable/kapacitor/values.yaml
@@ -17,7 +17,7 @@ service:
 ##
 persistence:
   enabled: false
-  storageClass: generic
+  storageClass: ""
   accessMode: ReadWriteOnce
   size: 8Gi
 

diff --git a/stable/magento/templates/apache-pvc.yaml b/stable/magento/templates/apache-pvc.yaml
@@ -9,7 +9,14 @@ metadata:
     release: "{{ .Release.Name }}"
     heritage: "{{ .Release.Service }}"
   annotations:
-    volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }}
+  {{- if .Values.persistence.apache.storageClass }}
+    volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass }}
+  {{ else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
+  {{- range $key, $value := .Values.persistence.apache.annotations }}
+    {{ $key }}: {{ $value }}
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.apache.accessMode | quote }}