From 858f0df9c86daba8130f607bdf1453d0876ca141 Mon Sep 17 00:00:00 2001 From: Amanda Cameron Date: Fri, 27 Jan 2017 20:53:02 -0500 Subject: [PATCH] [stable/mediawiki] Update to the recommended pvc patterns. (#453) * Convert chart mediawiki to use the recommended pvc patterns * Update README.md * Update apache-pvc.yaml * Update mediawiki-pvc.yaml * Update Chart.yaml * Update _helpers.tpl * Update requirements.lock * Update requirements.yaml * fix notes for 1.5 --- stable/mediawiki/README.md | 4 ++-- stable/mediawiki/requirements.lock | 6 +++--- stable/mediawiki/requirements.yaml | 2 +- stable/mediawiki/templates/NOTES.txt | 2 +- stable/mediawiki/templates/_helpers.tpl | 10 +++++----- stable/mediawiki/templates/apache-pvc.yaml | 6 +++++- stable/mediawiki/templates/mediawiki-pvc.yaml | 6 +++++- stable/mediawiki/values.yaml | 15 ++++++++++++--- 8 files changed, 34 insertions(+), 17 deletions(-) diff --git a/stable/mediawiki/README.md b/stable/mediawiki/README.md index b596879359..6f6f96e08a 100644 --- a/stable/mediawiki/README.md +++ b/stable/mediawiki/README.md @@ -61,10 +61,10 @@ The following tables lists the configurable parameters of the MediaWiki chart an | `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 class annotation) | | `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | -| `persistence.mediawiki.storageClass` | PVC Storage Class for MediaWiki volume | `generic` | +| `persistence.mediawiki.storageClass` | PVC Storage Class for MediaWiki volume | `nil` (uses alpha storage class annotation) | | `persistence.mediawiki.accessMode` | PVC Access Mode for MediaWiki volume | `ReadWriteOnce` | | `persistence.mediawiki.size` | PVC Storage Request for MediaWiki volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | diff --git a/stable/mediawiki/requirements.lock b/stable/mediawiki/requirements.lock index 9d2dad5f73..907fbd19b3 100644 --- a/stable/mediawiki/requirements.lock +++ b/stable/mediawiki/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:49:36.742067612-08:00 + version: 0.5.7 +digest: sha256:409eefb841b53ef1aa91d0607d87e6c475297df40101180c787260d766657d95 +generated: 2017-01-27T16:07:02.693815624-08:00 diff --git a/stable/mediawiki/requirements.yaml b/stable/mediawiki/requirements.yaml index 9303bd388a..ac65eec118 100644 --- a/stable/mediawiki/requirements.yaml +++ b/stable/mediawiki/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/mediawiki/templates/NOTES.txt b/stable/mediawiki/templates/NOTES.txt index 8c63ed9ff7..879ae22309 100644 --- a/stable/mediawiki/templates/NOTES.txt +++ b/stable/mediawiki/templates/NOTES.txt @@ -24,4 +24,4 @@ 2. Get your MediaWiki login credentials by running: echo Username: {{ .Values.mediawikiUser }} - echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mediawiki-password[*]}"`)) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.mediawiki-password}" | base64 --decode) diff --git a/stable/mediawiki/templates/_helpers.tpl b/stable/mediawiki/templates/_helpers.tpl index 4355810df4..1e52d321ca 100644 --- a/stable/mediawiki/templates/_helpers.tpl +++ b/stable/mediawiki/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/mediawiki/templates/apache-pvc.yaml b/stable/mediawiki/templates/apache-pvc.yaml index 39fd689744..166feb8b9f 100644 --- a/stable/mediawiki/templates/apache-pvc.yaml +++ b/stable/mediawiki/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/mediawiki/templates/mediawiki-pvc.yaml b/stable/mediawiki/templates/mediawiki-pvc.yaml index 97b3b759e2..5c260594d0 100644 --- a/stable/mediawiki/templates/mediawiki-pvc.yaml +++ b/stable/mediawiki/templates/mediawiki-pvc.yaml @@ -9,7 +9,11 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.mediawiki.storageClass | quote }} + {{- if .Values.persistence.mediawiki.storageClass }} + volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.mediawiki.storageClass | quote }} + {{- else }} + volume.alpha.kubernetes.io/storage-class: default + {{- end }} spec: accessModes: - {{ .Values.persistence.mediawiki.accessMode | quote }} diff --git a/stable/mediawiki/values.yaml b/stable/mediawiki/values.yaml index f38c691a5e..5e29322c1f 100644 --- a/stable/mediawiki/values.yaml +++ b/stable/mediawiki/values.yaml @@ -53,7 +53,10 @@ mariadb: ## persistence: enabled: true - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 8Gi @@ -68,11 +71,17 @@ serviceType: LoadBalancer persistence: enabled: true apache: - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 1Gi mediawiki: - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 8Gi