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

Made MariaDB Optional, Also added optional uri path

Browse Source
This commit is contained in:
Timothy Clarke
2017-12-06 10:31:20 +00:00
parent ea5e1a13bb
commit 8ff269616e
7 changed files with 33 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/wordpress/README.md
+9 -6
View File
@@ -55,21 +55,24 @@ The following tables lists the configurable parameters of the WordPress chart an
| `wordpressFirstName` | First name | `FirstName` |
| `wordpressLastName` | Last name | `LastName` |
| `wordpressBlogName` | Blog name | `User's Blog!` |
| `allowEmptyPassword` | Allow DB blank passwords | `yes` |
| `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` |
| `deployMariadb` | Deploy MariaDB container(s) | `true` |
| `mariadb.mariadbHostname` | MariaDB Hostname if deployMariadb is false | `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_ |
| `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` |
| `healthcheckHttps` | Use https for liveliness and readiness | `false` |
| `healthcheckHttps` | Use https for liveliness and readiness | `false` |
| `ingress.enabled` | Enable ingress controller resource | `false` |
| `ingress.hosts[0].name` | Hostname to your WordPress installation | `wordpress.local` |
| `ingress.hosts[0].path` | Path within the url structure | `/` |
| `ingress.hosts[0].tls` | Utilize TLS backend in ingress | `false` |
| `ingress.hosts[0].tlsSecret` | TLS Secret (certificates) | `wordpress.local-tls-secret` |
| `ingress.hosts[0].annotations` | Annotations for this host's ingress record | `[]` |
@@ -181,4 +184,4 @@ kubectl create secret tls wordpress.local-tls --key /path/to/key.key --cert /pat
```
Please see [this example](https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx/examples/tls)
for more information.
for more information.
stable/wordpress/requirements.lock
+3 -3
View File
@@ -1,6 +1,6 @@
dependencies:
- name: mariadb
repository: https://kubernetes-charts.storage.googleapis.com/
version: 0.7.0
digest: sha256:e1af13ac4ac21f67582006f12d2b4eb78a1a2a59b34338fac850f2bec0b08b41
generated: 2017-08-09T22:53:02.519960734-04:00
version: 2.0.1
digest: sha256:4a6b944d8a3f1c93a3b1d34a732e7943753bbcb11e6d4d4a14ebc71fd06de242
generated: 2017-10-27T09:17:36.692678441+01:00
stable/wordpress/requirements.yaml
+4 -1
View File
@@ -1,4 +1,7 @@
dependencies:
- name: mariadb
version: 0.7.0
version: 2.0.1
repository: https://kubernetes-charts.storage.googleapis.com/
condition: deployMariadb
tags:
- wordpress-database
stable/wordpress/templates/deployment.yaml
+4
View File
@@ -31,7 +31,11 @@ spec:
name: {{ template "mariadb.fullname" . }}
key: mariadb-root-password
- name: MARIADB_HOST
{{- if .Values.deployMariadb }}
value: {{ template "mariadb.fullname" . }}
{{- else }}
value: {{ default "" .Values.mariadb.mariadbHostname | quote }}
{{- end }}
- name: MARIADB_PORT_NUMBER
value: "3306"
- name: WORDPRESS_DATABASE_NAME
stable/wordpress/templates/ingress.yaml
+2 -2
View File
@@ -21,7 +21,7 @@ spec:
- host: {{ .name }}
http:
paths:
- path: /
- path: {{ default "/" .path }}
backend:
serviceName: {{ template "fullname" $ }}
servicePort: {{ if .tls }}443{{ else }}80{{end}}
@@ -33,4 +33,4 @@ spec:
{{- end }}
---
{{- end }}
{{- end }}
{{- end }}
stable/wordpress/templates/tests/test-mariadb-connection.yaml
+4
View File
@@ -10,7 +10,11 @@ spec:
image: {{ .Values.image }}
env:
- name: MARIADB_HOST
{{- if .Values.deployMariadb }}
value: {{ template "mariadb.fullname" . }}
{{- else }}
value: {{ default "" .Values.mariadb.mariadbHostname | quote }}
{{- end }}
- name: MARIADB_PORT
value: "3306"
- name: WORDPRESS_DATABASE_NAME
stable/wordpress/values.yaml
+7
View File
@@ -53,10 +53,17 @@ allowEmptyPassword: yes
# smtpUsername:
# smtpProtocol:
## Deploy MariaDB containers
deployMariadb: true
##
## MariaDB chart configuration
##
mariadb:
## MariaDB Hostname
## If you would prefer to use a preexisting database host setdeployMariadb to false and then enter the hostname below
# mariadbHostname:
## MariaDB admin password
## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run
##