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

WordPress updates (0.4.0) (#367)

Browse Source 
* wordpress: add alpha and beta storageclass annotation support

* wordpress: use random password if not specified

* wordpress: update MariaDB dep

* wordpress: explicitly set imagePullPolicy

* wordpress: increase resource name truncation and trim '-' suffix

* wordpress: improve storageclass readme description

* wordpress: use built-in toYaml helper
This commit is contained in:
Adnan Abdulhussein
2017-01-09 20:38:23 -08:00
committed by Lachlan Evenson
parent 2da00e9487
commit bcc323d57d
11 changed files with 44 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/wordpress/Chart.yaml
+1 -1
View File
@@ -1,5 +1,5 @@
name: wordpress
version: 0.3.4
version: 0.4.0
description: Web publishing platform for building blogs and websites.
keywords:
- wordpress
stable/wordpress/README.md
+4 -4
View File
@@ -60,9 +60,9 @@ The following tables lists the configurable parameters of the WordPress chart an
| Parameter | Description | Default |
| ------------------------------- | ------------------------------- | ---------------------------------------------------------- |
| `image` | WordPress image | `bitnami/wordpress:{VERSION}` |
| `imagePullPolicy` | Image pull policy | `Always` if `image` tag is `latest`, else `IfNotPresent` |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `wordpressUsername` | User of the application | `user` |
| `wordpressPassword` | Application password | `bitnami` |
| `wordpressPassword` | Application password | _random 10 character long alphanumeric string_ |
| `wordpressEmail` | Admin email | `user@example.com` |
| `wordpressFirstName` | First name | `FirstName` |
| `wordpressLastName` | Last name | `LastName` |
@@ -76,10 +76,10 @@ The following tables lists the configurable parameters of the WordPress 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.wordpress.storageClass` | PVC Storage Class for WordPress volume | `generic` |
| `persistence.wordpress.storageClass` | PVC Storage Class for WordPress volume | `nil` (uses alpha storage class annotation) |
| `persistence.wordpress.accessMode` | PVC Access Mode for WordPress volume | `ReadWriteOnce` |
| `persistence.wordpress.size` | PVC Storage Request for WordPress volume | `8Gi` |
stable/wordpress/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:16.520834727-08:00
version: 0.5.6
digest: sha256:1b3aad03b4383d1a24dfbfef6ba1beb45f7ace2baa399c66f5a4d56d0f7bc717
generated: 2017-01-05T16:27:48.098725855Z
stable/wordpress/requirements.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
dependencies:
- name: mariadb
version: 0.5.2
version: 0.5.x
repository: https://kubernetes-charts.storage.googleapis.com/
stable/wordpress/templates/NOTES.txt
+2 -2
View File
@@ -22,5 +22,5 @@
2. Login with the following credentials to see your blog
Username: {{ .Values.wordpressUsername }}
Password: {{ .Values.wordpressPassword }}
echo Username: {{ .Values.wordpressUsername }}
echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.wordpress-password}" | base64 --decode)
stable/wordpress/templates/_helpers.tpl
+3 -15
View File
@@ -3,7 +3,7 @@
Expand the name of the chart.
*/}}
{{- define "name" -}}
{{- default .Chart.Name .Values.nameOverride | trunc 24 -}}
{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{/*
@@ -12,7 +12,7 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this
*/}}
{{- 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 -}}
{{/*
@@ -20,17 +20,5 @@ 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).
*/}}
{{- define "mariadb.fullname" -}}
{{- printf "%s-%s" .Release.Name "mariadb" | trunc 24 -}}
{{- end -}}
{{- define "toYaml" -}}
{{- range $key, $value := . -}}
{{- $map := kindIs "map" $value -}}
{{- if $map }}
{{ $key }}:
{{- include "toYaml" $value | indent 2 }}
{{- else }}
{{ $key }}: {{ $value }}
{{- end }}
{{- end -}}
{{- printf "%s-%s" .Release.Name "mariadb" | trunc 63 | trimSuffix "-" -}}
{{- end -}}
stable/wordpress/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/wordpress/templates/deployment.yaml
+1 -1
View File
@@ -81,7 +81,7 @@ spec:
- name: apache-data
mountPath: /bitnami/apache
resources:
{{ include "toYaml" .Values.resources | indent 10 }}
{{ toYaml .Values.resources | indent 10 }}
volumes:
- name: wordpress-data
{{- if .Values.persistence.enabled }}
stable/wordpress/templates/secrets.yaml
+4
View File
@@ -9,5 +9,9 @@ metadata:
heritage: "{{ .Release.Service }}"
type: Opaque
data:
{{ if .Values.wordpressPassword }}
wordpress-password: {{ default "" .Values.wordpressPassword | b64enc | quote }}
{{ else }}
wordpress-password: {{ randAlphaNum 10 | b64enc | quote }}
{{ end }}
smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }}
stable/wordpress/templates/wordpress-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.wordpress.storageClass | quote }}
{{- if .Values.persistence.wordpress.storageClass }}
volume.beta.kubernetes.io/storage-class: {{ .Values.persistence.wordpress.storageClass | quote }}
{{- else }}
volume.alpha.kubernetes.io/storage-class: default
{{- end }}
spec:
accessModes:
- {{ .Values.persistence.wordpress.accessMode | quote }}
stable/wordpress/values.yaml
+15 -6
View File
@@ -4,10 +4,9 @@
image: bitnami/wordpress:4.7-r0
## Specify a imagePullPolicy
## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
##
# imagePullPolicy:
imagePullPolicy: IfNotPresent
## User of the application
## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
@@ -15,9 +14,10 @@ image: bitnami/wordpress:4.7-r0
wordpressUsername: user
## Application password
## Defaults to a random 10-character alphanumeric string if not set
## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
##
wordpressPassword: bitnami
# wordpressPassword:
## Admin email
## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
@@ -63,7 +63,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: generic
accessMode: ReadWriteOnce
size: 8Gi
@@ -78,11 +81,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: generic
accessMode: ReadWriteOnce
size: 1Gi
wordpress:
storageClass: generic
## If defined, volume.beta.kubernetes.io/storage-class: <storageClass>
## Default: volume.alpha.kubernetes.io/storage-class: default
##
# storageClass: generic
accessMode: ReadWriteOnce
size: 8Gi