[stable/joomla] Update to the recommended pvc patterns. (#449)

* Convert chart joomla to use the recommended pvc patterns * Update README.md * Update apache-pvc.yaml * Update joomla-pvc.yaml * Update Chart.yaml * Update _helpers.tpl * Update requirements.lock * Update requirements.yaml * fix notes for 1.5 * Update requirements.lock
helm · Jan 28, 2017 · 9d8ed51 · 9d8ed51
1 parent a7fc595
commit 9d8ed51
Show file tree

Hide file tree

Showing 8 changed files with 34 additions and 17 deletions.
diff --git a/stable/joomla/README.md b/stable/joomla/README.md
@@ -61,10 +61,10 @@ The following tables lists the configurable parameters of the Joomla! chart and
 | `mariadb.mariadbRootPassword`     | MariaDB admin password                 | `nil`                                                     |
 | `serviceType`                     | Kubernetes Service type                | `LoadBalancer`                                            |
 | `persistence.enabled`             | Enable persistence using PVC           | `true`                                                    |
-| `persistence.apache.storageClass` | PVC Storage Class for Apache volume    | `generic`                                                 |
+| `persistence.apache.storageClass` | PVC Storage Class for Apache volume    | `nil` (uses alpha storage annotation)                                                |
 | `persistence.apache.accessMode`   | PVC Access Mode for Apache volume      | `ReadWriteOnce`                                           |
 | `persistence.apache.size`         | PVC Storage Request for Apache volume  | `1Gi`                                                     |
-| `persistence.joomla.storageClass` | PVC Storage Class for Joomla! volume   | `generic`                                                 |
+| `persistence.joomla.storageClass` | PVC Storage Class for Joomla! volume   | `nil` (uses alpha storage annotation)                                                |
 | `persistence.joomla.accessMode`   | PVC Access Mode for Joomla! volume     | `ReadWriteOnce`                                           |
 | `persistence.joomla.size`         | PVC Storage Request for Joomla! volume | `8Gi`                                                     |
 | `resources`                       | CPU/Memory resource requests/limits    | Memory: `512Mi`, CPU: `300m`                              |

diff --git a/stable/joomla/requirements.lock b/stable/joomla/requirements.lock
@@ -1,6 +1,6 @@
 dependencies:
 - name: mariadb
   repository: https://kubernetes-charts.storage.googleapis.com/
-  version: 0.5.6
-digest: sha256:1b3aad03b4383d1a24dfbfef6ba1beb45f7ace2baa399c66f5a4d56d0f7bc717
-generated: 2017-01-25T15:39:21.383456388-08:00
+  version: 0.5.7
+digest: sha256:409eefb841b53ef1aa91d0607d87e6c475297df40101180c787260d766657d95
+generated: 2017-01-27T16:07:02.693815624-08:00
diff --git a/stable/joomla/requirements.yaml b/stable/joomla/requirements.yaml
@@ -1,4 +1,4 @@
 dependencies:
 - name: mariadb
-  version: 0.5.x
+  version: 0.5.7
   repository: https://kubernetes-charts.storage.googleapis.com/
diff --git a/stable/joomla/templates/NOTES.txt b/stable/joomla/templates/NOTES.txt
@@ -23,4 +23,4 @@
 2. Get your Joomla! login credentials by running:
 
     echo Username: {{ .Values.joomlaUsername }}
-    echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.joomla-password[*]}"`))
+    echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.joomla-password}" | base64 --decode)
diff --git a/stable/joomla/templates/_helpers.tpl b/stable/joomla/templates/_helpers.tpl
@@ -3,22 +3,22 @@
 Expand the name of the chart.
 */}}
 {{- define "name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
+{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "fullname" -}}
 {{- $name := default .Chart.Name .Values.nameOverride -}}
-{{- printf "%s-%s" .Release.Name $name | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{/*
 Create a default fully qualified app name.
-We truncate at 24 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
+We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
 */}}
 {{- define "mariadb.fullname" -}}
-{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}}
+{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
diff --git a/stable/joomla/templates/apache-pvc.yaml b/stable/joomla/templates/apache-pvc.yaml
@@ -9,7 +9,11 @@ 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 | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- 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,11 @@ 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 | quote }}
+  {{- else }}
+    volume.alpha.kubernetes.io/storage-class: default
+  {{- end }}
 spec:
   accessModes:
     - {{ .Values.persistence.joomla.accessMode | quote }}

diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml
@@ -49,7 +49,10 @@ mariadb:
   ##
   persistence:
     enabled: true
-    storageClass: generic
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ##
+    # storageClass:
     accessMode: ReadWriteOnce
     size: 8Gi
 
@@ -64,11 +67,17 @@ serviceType: LoadBalancer
 persistence:
   enabled: true
   apache:
-    storageClass: generic
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ##
+    # storageClass:
     accessMode: ReadWriteOnce
     size: 1Gi
   joomla:
-    storageClass: generic
+    ## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
+    ## Default: volume.alpha.kubernetes.io/storage-class: default
+    ##
+    # storageClass:
     accessMode: ReadWriteOnce
     size: 8Gi