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

[stable/wordpress] Allow helm chart to receive an existing database or create it by itself Open, HighAll Users #773

Merged
merged 18 commits into from
Mar 15, 2017
Merged

[stable/wordpress] Allow helm chart to receive an existing database or create it by itself Open, HighAll Users #773

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f9c5ad5
Allow to the Wordpress helm chart to receive an existing database or …
jbianquetti-nami Mar 8, 2017
c19d24f
added links to documentation for new env vars
jbianquetti-nami Mar 8, 2017
970a403
added changes with compatibility threats for 0.4.x chart series. Bu…
jbianquetti-nami Mar 8, 2017
3a19452
added defaults for many values and fixes typos
jbianquetti-nami Mar 8, 2017
39a5013
Allow to the Wordpress helm chart to receive an existing database or …
jbianquetti-nami Mar 8, 2017
b1a1839
added defaults for many values and fixes typos
jbianquetti-nami Mar 8, 2017
1be138e
fix typo
jbianquetti-nami Mar 9, 2017
8daf03e
cosmetic revision
jbianquetti-nami Mar 9, 2017
5306d37
updated dependency on mariadb chart 0.5.10
jbianquetti-nami Mar 9, 2017
4ae10e3
environment vars clean up
jbianquetti-nami Mar 10, 2017
90ac1ee
Readme reformatting
jbianquetti-nami Mar 14, 2017
ce18810
added changes with compatibility threats for 0.4.x chart series. Bu…
jbianquetti-nami Mar 8, 2017
a5c4f42
added defaults for many values and fixes typos
jbianquetti-nami Mar 8, 2017
bcf9706
fix typo
jbianquetti-nami Mar 9, 2017
e8439ef
Allow to the Wordpress helm chart to receive an existing database or …
jbianquetti-nami Mar 8, 2017
1919ea9
added defaults for many values and fixes typos
jbianquetti-nami Mar 8, 2017
6383f70
fix typo
jbianquetti-nami Mar 9, 2017
c48b89f
fixing default value in README for AllowEmptyPassword
jbianquetti-nami Mar 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion stable/wordpress/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: wordpress
version: 0.4.3
version: 0.5.0
description: Web publishing platform for building blogs and websites.
icon: https://bitnami.com/assets/stacks/wordpress/img/wordpress-stack-220x234.png
keywords:
Expand Down
60 changes: 32 additions & 28 deletions stable/wordpress/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,34 +45,38 @@ The command removes all the Kubernetes components associated with the chart and

The following tables lists the configurable parameters of the WordPress chart and their default values.

| Parameter | Description | Default |
| ------------------------------- | ------------------------------- | ---------------------------------------------------------- |
| `image` | WordPress image | `bitnami/wordpress:{VERSION}` |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `wordpressUsername` | User of the application | `user` |
| `wordpressPassword` | Application password | _random 10 character long alphanumeric string_ |
| `wordpressEmail` | Admin email | `user@example.com` |
| `wordpressFirstName` | First name | `FirstName` |
| `wordpressLastName` | Last name | `LastName` |
| `wordpressBlogName` | Blog name | `User's Blog!` |
| `smtpHost` | SMTP host | `nil` |
| `smtpPort` | SMTP port | `nil` |
| `smtpUser` | SMTP user | `nil` |
| `smtpPassword` | SMTP password | `nil` |
| `smtpUsername` | User name for SMTP emails | `nil` |
| `smtpProtocol` | SMTP protocol [`tls`, `ssl`] | `nil` |
| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` |
| `serviceType` | Kubernetes Service type | `LoadBalancer` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.hostname` | URL to address your WordPress installation | `wordpress.local` |
| `ingress.tls` | Ingress TLS configuration | `[]` |
| `persistence.enabled` | Enable persistence using PVC | `true` |
| `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 | `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` |
| Parameter | Description | Default |
|--------------------------------------|--------------------------------------------|------------------------------------------------|
| `image` | WordPress image | `bitnami/wordpress:{VERSION}` |
| `imagePullPolicy` | Image pull policy | `IfNotPresent` |
| `wordpressUsername` | User of the application | `user` |
| `wordpressPassword` | Application password | _random 10 character long alphanumeric string_ |
| `wordpressEmail` | Admin email | `user@example.com` |
| `wordpressFirstName` | First name | `FirstName` |
| `wordpressLastName` | Last name | `LastName` |
| `wordpressBlogName` | Blog name | `User's Blog!` |
| `allowEmptyPassword` | Allow DB blank passwords | `yes` |
| `smtpHost` | SMTP host | `nil` |
| `smtpPort` | SMTP port | `nil` |
| `smtpUser` | SMTP user | `nil` |
| `smtpPassword` | SMTP password | `nil` |
| `smtpUsername` | User name for SMTP emails | `nil` |
| `smtpProtocol` | SMTP protocol [`tls`, `ssl`] | `nil` |
| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` |
| `mariadb.mariadbDatabase` | Database name to create | `bitnami_wordpress` |
| `mariadb.mariadbUser` | Database user to create | `bn_wordpress` |
| `mariadb.mariadbPassword` | Password for the database | _random 10 character long alphanumeric string_ |
| `serviceType` | Kubernetes Service type | `LoadBalancer` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.hostname` | URL to address your WordPress installation | `wordpress.local` |
| `ingress.tls` | Ingress TLS configuration | `[]` |
| `persistence.enabled` | Enable persistence using PVC | `true` |
| `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 | `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` |

The above parameters map to the env variables defined in [bitnami/wordpress](http://github.com/bitnami/bitnami-docker-wordpress). For more information please refer to the [bitnami/wordpress](http://github.com/bitnami/bitnami-docker-wordpress) image documentation.

Expand Down
6 changes: 3 additions & 3 deletions stable/wordpress/requirements.lock
View file
Open in desktop
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.9
digest: sha256:2c911bb44ebae5d8e3d9d69cfb49ce9704cf6cd02bc3583b29fc945e9f213d6a
generated: 2017-02-14T19:54:59.173151824-05:00
version: 0.5.10
digest: sha256:6a6567b76c5ff5d87c65bb1fe9b330d260bd0b1db0f72760dc5a7e5d166b8635
generated: 2017-03-09T12:25:44.190563274+01:00
2 changes: 1 addition & 1 deletion stable/wordpress/requirements.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
dependencies:
- name: mariadb
version: 0.5.9
version: 0.5.10
repository: https://kubernetes-charts.storage.googleapis.com/
4 changes: 2 additions & 2 deletions stable/wordpress/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Expand the name of the chart.

{{/*
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 -}}
Expand All @@ -17,7 +17,7 @@ We truncate at 24 chars because some Kubernetes name fields are limited to this

{{/*
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 63 | trimSuffix "-" -}}
Expand Down
19 changes: 17 additions & 2 deletions stable/wordpress/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,30 @@ spec:
image: "{{ .Values.image }}"
imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }}
env:
- name: ALLOW_EMPTY_PASSWORD
{{- if .Values.allowEmptyPassword }}
value: "yes"
{{- else }}
value: "no"
{{- end }}
- name: MARIADB_ROOT_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "mariadb.fullname" . }}
key: mariadb-root-password
- name: MARIADB_HOST
value: {{ template "mariadb.fullname" . }}
- name: MARIADB_PORT
value: "3306"
- name: MARIADB_PASSWORD
- name: WORDPRESS_DATABASE_NAME
value: {{ default "" .Values.mariadb.mariadbDatabase | quote }}
- name: WORDPRESS_DATABASE_USER
value: {{ default "" .Values.mariadb.mariadbUser | quote }}
- name: WORDPRESS_DATABASE_PASSWORD
valueFrom:
secretKeyRef:
name: {{ template "mariadb.fullname" . }}
key: mariadb-root-password
key: mariadb-password
- name: WORDPRESS_USERNAME
value: {{ default "" .Values.wordpressUsername | quote }}
- name: WORDPRESS_PASSWORD
Expand Down
5 changes: 5 additions & 0 deletions stable/wordpress/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,9 @@ data:
{{ else }}
wordpress-password: {{ randAlphaNum 10 | b64enc | quote }}
{{ end }}
{{ if .Values.databasePassword }}
wordpress-db-password: {{ default "" .Values.databasePassword | b64enc | quote }}
{{ else }}
wordpress-db-password: {{ randAlphaNum 10 | b64enc | quote }}
{{ end }}
smtp-password: {{ default "" .Values.smtpPassword | b64enc | quote }}
19 changes: 19 additions & 0 deletions stable/wordpress/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,10 @@ wordpressLastName: LastName
##
wordpressBlogName: User's Blog!

## Set to `yes` to allow the container to be started with blank passwords
## ref: https://github.com/bitnami/bitnami-docker-wordpress#environment-variables
allowEmptyPassword: yes

## SMTP mail delivery configuration
## ref: https://github.com/bitnami/bitnami-docker-wordpress/#smtp-configuration
##
Expand All @@ -58,6 +62,21 @@ mariadb:
##
# mariadbRootPassword:

## Create a database
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run
##
mariadbDatabase: bitnami_wordpress

## Create a database user
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run
##
mariadbUser: bn_wordpress

## Password for mariadbUser
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run
##
# mariadbPassword:

## Enable persistence using Persistent Volume Claims
## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/
##
Expand Down