github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-19 20:37:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/phpbb] Update to the recommended pvc patterns. (#460)

Browse Source 
* 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
This commit is contained in:
Amanda Cameron
2017-01-30 16:12:18 -08:00
committed by Adnan Abdulhussein
parent e1bde6872d
commit 2d71d5bce8
9 changed files with 35 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/phpbb/Chart.yaml
+1 -1
View File
@@ -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
stable/phpbb/README.md
+2 -2
View File
@@ -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` |
stable/phpbb/requirements.lock
+3 -3
View File
@@ -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
stable/phpbb/requirements.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
dependencies:
- name: mariadb
version: 0.5.2
version: 0.5.7
repository: https://kubernetes-charts.storage.googleapis.com/
stable/phpbb/templates/NOTES.txt
+1 -1
View File
@@ -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)
stable/phpbb/templates/_helpers.tpl
+5 -5
View File
@@ -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 -}}
stable/phpbb/templates/apache-pvc.yaml
+5 -1
View File
@@ -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 }}
stable/phpbb/templates/phpbb-pvc.yaml
+5 -1
View File
@@ -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 }}
stable/phpbb/values.yaml
+12 -3
View File
@@ -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