Skip to content
This repository has been archived by the owner on Feb 22, 2022. It is now read-only.

Commit

Permalink
[stable/phpbb] Update to the recommended pvc patterns. (#460)
Browse files Browse the repository at this point in the history
* Convert chart phpbb to use the recommended pvc patterns

* fix notes for 1.5

* update mariadb dep

* truncate to 63 and trim trailing dashes

* remove annotations and fix trunc in pvc

* document alpha storage class fallback

* bump version
AmandaCameron authored and prydonius committed Jan 31, 2017
1 parent e1bde68 commit 2d71d5b
Showing 9 changed files with 35 additions and 18 deletions.
2 changes: 1 addition & 1 deletion stable/phpbb/Chart.yaml
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions stable/phpbb/README.md
Original file line number Diff line number Diff line change
@@ -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` |
6 changes: 3 additions & 3 deletions stable/phpbb/requirements.lock
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion stable/phpbb/requirements.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: mariadb
version: 0.5.2
version: 0.5.7
repository: https://kubernetes-charts.storage.googleapis.com/
2 changes: 1 addition & 1 deletion stable/phpbb/templates/NOTES.txt
Original file line number Diff line number Diff line change
@@ -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)
10 changes: 5 additions & 5 deletions stable/phpbb/templates/_helpers.tpl
Original file line number Diff line number Diff line change
@@ -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 -}}
6 changes: 5 additions & 1 deletion stable/phpbb/templates/apache-pvc.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
6 changes: 5 additions & 1 deletion stable/phpbb/templates/phpbb-pvc.yaml
Original file line number Diff line number Diff line change
@@ -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 }}
15 changes: 12 additions & 3 deletions stable/phpbb/values.yaml
Original file line number Diff line number Diff line change
@@ -47,7 +47,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

@@ -62,11 +65,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
phpbb:
storageClass: generic
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
##
# storageClass:
accessMode: ReadWriteOnce
size: 8Gi

0 comments on commit 2d71d5b

Please sign in to comment.