diff --git a/stable/phpbb/Chart.yaml b/stable/phpbb/Chart.yaml index b42ea8ea85c8..e06013ddc35e 100644 --- a/stable/phpbb/Chart.yaml +++ b/stable/phpbb/Chart.yaml @@ -1,5 +1,5 @@ name: phpbb -version: 0.4.1 +version: 0.4.2 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: - phpbb diff --git a/stable/phpbb/README.md b/stable/phpbb/README.md index ee29139bb99b..c20c3ba9ed80 100644 --- a/stable/phpbb/README.md +++ b/stable/phpbb/README.md @@ -59,10 +59,10 @@ The following tables lists the configurable parameters of the phpBB chart and th | `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.phpbb.storageClass` | PVC Storage Class for phpBB volume | `generic` | +| `persistence.phpbb.storageClass` | PVC Storage Class for phpBB volume | `nil` (uses alpha storage class annotation) | | `persistence.phpbb.accessMode` | PVC Access Mode for phpBB volume | `ReadWriteOnce` | | `persistence.phpbb.size` | PVC Storage Request for phpBB volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | diff --git a/stable/phpbb/requirements.lock b/stable/phpbb/requirements.lock index 4d858ef3df28..97210aaaf871 100644 --- a/stable/phpbb/requirements.lock +++ b/stable/phpbb/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.5.2 -digest: sha256:ae046856c4ffb4d8eafbf3c0f7281dd28b28f32323115e045336674cfe1ccc56 -generated: 2016-11-18T16:08:15.350208134-08:00 + version: 0.5.7 +digest: sha256:409eefb841b53ef1aa91d0607d87e6c475297df40101180c787260d766657d95 +generated: 2017-01-27T18:20:03.117235483-08:00 diff --git a/stable/phpbb/requirements.yaml b/stable/phpbb/requirements.yaml index 9590b3779369..ac65eec118da 100644 --- a/stable/phpbb/requirements.yaml +++ b/stable/phpbb/requirements.yaml @@ -1,4 +1,4 @@ dependencies: - name: mariadb - version: 0.5.2 + version: 0.5.7 repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/stable/phpbb/templates/NOTES.txt b/stable/phpbb/templates/NOTES.txt index b12c03fd9b2f..e8bf0632a82c 100644 --- a/stable/phpbb/templates/NOTES.txt +++ b/stable/phpbb/templates/NOTES.txt @@ -24,4 +24,4 @@ 2. Get your phpBB login credentials by running: echo Username: {{ .Values.phpbbUser }} - echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.phpbb-password[*]}"`)) + echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.phpbb-password}" | base64 --decode) diff --git a/stable/phpbb/templates/_helpers.tpl b/stable/phpbb/templates/_helpers.tpl index 4355810df459..1e52d321ca4a 100644 --- a/stable/phpbb/templates/_helpers.tpl +++ b/stable/phpbb/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/phpbb/templates/apache-pvc.yaml b/stable/phpbb/templates/apache-pvc.yaml index 39fd689744be..166feb8b9f47 100644 --- a/stable/phpbb/templates/apache-pvc.yaml +++ b/stable/phpbb/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/phpbb/templates/phpbb-pvc.yaml b/stable/phpbb/templates/phpbb-pvc.yaml index 701fc3930740..6715d5c7f043 100644 --- a/stable/phpbb/templates/phpbb-pvc.yaml +++ b/stable/phpbb/templates/phpbb-pvc.yaml @@ -9,7 +9,11 @@ metadata: release: "{{ .Release.Name }}" heritage: "{{ .Release.Service }}" annotations: - volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.phpbb.storageClass | quote }} + {{- if .Values.persistence.phpbb.storageClass }} + volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.phpbb.storageClass | quote }} + {{- else }} + volume.alpha.kubernetes.io/storage-class: default + {{- end }} spec: accessModes: - {{ .Values.persistence.phpbb.accessMode | quote }} diff --git a/stable/phpbb/values.yaml b/stable/phpbb/values.yaml index dfa921dc54a4..39053508d479 100644 --- a/stable/phpbb/values.yaml +++ b/stable/phpbb/values.yaml @@ -47,7 +47,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 @@ -62,11 +65,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 phpbb: - storageClass: generic + ## If defined, volume.beta.kubernetes.io/storage-class: + ## Default: volume.alpha.kubernetes.io/storage-class: default + ## + # storageClass: accessMode: ReadWriteOnce size: 8Gi