diff --git a/stable/joomla/Chart.yaml b/stable/joomla/Chart.yaml index 8f5099035b..5e1c6a42eb 100644 --- a/stable/joomla/Chart.yaml +++ b/stable/joomla/Chart.yaml @@ -1,5 +1,5 @@ name: joomla -version: 0.5.9 +version: 0.6.0 appVersion: 3.8.6 description: PHP content management system (CMS) for publishing web content keywords: diff --git a/stable/joomla/README.md b/stable/joomla/README.md index 61b2281307..02c835b574 100644 --- a/stable/joomla/README.md +++ b/stable/joomla/README.md @@ -58,13 +58,23 @@ The following tables lists the configurable parameters of the Joomla! chart and | `smtpPassword` | SMTP password | `nil` | | `smtpUsername` | User name for SMTP emails | `nil` | | `smtpProtocol` | SMTP protocol [`tls`, `ssl`] | `nil` | +| `allowEmptyPassword` | Allow DB blank passwords | `yes` | +| `externalDatabase.host` | Host of the external database | `nil` | +| `externalDatabase.port` | Port of the external database | `3306` | +| `externalDatabase.user` | Existing username in the external db | `bn_joomla` | +| `externalDatabase.password` | Password for the above username | `nil` | +| `externalDatabase.database` | Name of the existing databse | `bitnami_joomla` | +| `mariadb.enabled` | Wheter to use or not the mariadb chart | `true` | +| `mariadb.mariadbDatabase` | Database name to create | `bitnami_joomla` | +| `mariadb.mariadbUser` | Database user to create | `bn_joomla` | +| `mariadb.mariadbPassword` | Password for the database | `nil` | | `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 | `nil` (uses alpha storage annotation) | +| `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `nil` (uses alpha storage annotation) | | `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | -| `persistence.joomla.storageClass` | PVC Storage Class for Joomla! volume | `nil` (uses alpha storage annotation) | +| `persistence.joomla.storageClass` | PVC Storage Class for Joomla! volume | `nil` (uses alpha storage annotation) | | `persistence.joomla.accessMode` | PVC Access Mode for Joomla! volume | `ReadWriteOnce` | | `persistence.joomla.size` | PVC Storage Request for Joomla! volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | diff --git a/stable/joomla/requirements.lock b/stable/joomla/requirements.lock index 135783f541..e833b51b66 100644 --- a/stable/joomla/requirements.lock +++ b/stable/joomla/requirements.lock @@ -2,5 +2,5 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ version: 0.7.0 -digest: sha256:e1af13ac4ac21f67582006f12d2b4eb78a1a2a59b34338fac850f2bec0b08b41 -generated: 2017-08-09T22:52:50.62658821-04:00 +digest: sha256:f59f68030aa5c50b9e776b813804875fac911f91c2aa384e991f37a795c5ae34 +generated: 2018-03-14T18:31:19.031367+01:00 diff --git a/stable/joomla/requirements.yaml b/stable/joomla/requirements.yaml index 4896aa89de..f726174b20 100644 --- a/stable/joomla/requirements.yaml +++ b/stable/joomla/requirements.yaml @@ -2,3 +2,4 @@ dependencies: - name: mariadb version: 0.7.0 repository: https://kubernetes-charts.storage.googleapis.com/ + condition: mariadb.enabled \ No newline at end of file diff --git a/stable/joomla/templates/NOTES.txt b/stable/joomla/templates/NOTES.txt index 0483086c32..c418bb5b5c 100644 --- a/stable/joomla/templates/NOTES.txt +++ b/stable/joomla/templates/NOTES.txt @@ -1,3 +1,4 @@ +{{- if or .Values.mariadb.enabled .Values.externalDatabase.host -}} 1. Get the Joomla! URL by running: {{- if contains "NodePort" .Values.serviceType }} @@ -24,3 +25,19 @@ echo Username: {{ .Values.joomlaUsername }} echo Password: $(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "joomla.fullname" . }} -o jsonpath="{.data.joomla-password}" | base64 --decode) + +{{- else -}} + +######################################################################################## +### ERROR: You did not provide an external database host in your 'helm install' call ### +######################################################################################## + +This deployment will be incomplete until you configure Joomla! with a resolvable database +host. To configure Joomla! to use and external database host: + + +1. Complete your Joomla! deployment by running: + + helm upgrade {{ .Release.Name }} --set serviceType={{ .Values.serviceType }},mariadb.enabled=false,externalDatabase.host=YOUR_EXTERNAL_DATABASE_HOST stable/joomla + +{{- end }} diff --git a/stable/joomla/templates/deployment.yaml b/stable/joomla/templates/deployment.yaml index 5a8bff2873..5fb5db44ac 100644 --- a/stable/joomla/templates/deployment.yaml +++ b/stable/joomla/templates/deployment.yaml @@ -19,15 +19,37 @@ spec: image: "{{ .Values.image }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: + - name: ALLOW_EMPTY_PASSWORD + value: {{ .Values.allowEmptyPassword | quote }} + {{- if .Values.mariadb.enabled }} - name: MARIADB_HOST value: {{ template "joomla.mariadb.fullname" . }} - name: MARIADB_PORT_NUMBER value: "3306" - - name: MARIADB_PASSWORD + - name: JOOMLA_DATABASE_NAME + value: {{ .Values.mariadb.mariadbDatabase | quote }} + - name: JOOMLA_DATABASE_USER + value: {{ .Values.mariadb.mariadbUser | quote }} + - name: JOOMLA_DATABASE_PASSWORD valueFrom: secretKeyRef: name: {{ template "joomla.mariadb.fullname" . }} - key: mariadb-root-password + key: mariadb-password + {{- else }} + - name: MARIADB_HOST + value: {{ .Values.externalDatabase.host | quote }} + - name: MARIADB_PORT_NUMBER + value: {{ .Values.externalDatabase.port | quote }} + - name: JOOMLA_DATABASE_NAME + value: {{ .Values.externalDatabase.database | quote }} + - name: JOOMLA_DATABASE_USER + value: {{ .Values.externalDatabase.user | quote }} + - name: JOOMLA_DATABASE_PASSWORD + valueFrom: + secretKeyRef: + name: {{ printf "%s-%s" .Release.Name "externaldb" }} + key: db-password + {{- end }} - name: JOOMLA_USERNAME value: {{ default "" .Values.joomlaUsername | quote }} - name: JOOMLA_PASSWORD diff --git a/stable/joomla/templates/externaldb-secrets.yaml b/stable/joomla/templates/externaldb-secrets.yaml new file mode 100644 index 0000000000..4ceb148898 --- /dev/null +++ b/stable/joomla/templates/externaldb-secrets.yaml @@ -0,0 +1,14 @@ +{{- if not .Values.mariadb.enabled }} +apiVersion: v1 +kind: Secret +metadata: + name: {{ printf "%s-%s" .Release.Name "externaldb" }} + labels: + app: {{ printf "%s-%s" .Release.Name "externaldb" }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" +type: Opaque +data: + db-password: {{ default "" .Values.externalDatabase.password | b64enc | quote }} +{{- end }} \ No newline at end of file diff --git a/stable/joomla/values.yaml b/stable/joomla/values.yaml index ff9c05b420..5b4f5b3d14 100644 --- a/stable/joomla/values.yaml +++ b/stable/joomla/values.yaml @@ -1,7 +1,7 @@ ## Bitnami Joomla! image version ## ref: https://hub.docker.com/r/bitnami/joomla/tags/ ## -image: bitnami/joomla:3.8.6-r0 +image: bitnami/joomla:3.8.6-r1 ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' @@ -25,6 +25,29 @@ joomlaUsername: user ## joomlaEmail: user@example.com +## Set to `yes` to allow the container to be started with blank passwords +## ref: https://github.com/bitnami/bitnami-docker-joomla#environment-variables +allowEmptyPassword: "yes" + +## +## External database configuration +## +externalDatabase: + ## Database host + host: + + ## Database host + port: 3306 + + ## Database user + user: bn_jasperreports + + ## Database password + password: + + ## Database name + database: bitnami_jasperreports + ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-joomla/#smtp-configuration ## @@ -39,6 +62,24 @@ joomlaEmail: user@example.com ## MariaDB chart configuration ## mariadb: + ## Whether to deploy a mariadb server to satisfy the applications database requirements. To use an external database set this to false and configure the externalDatabase parameters + enabled: true + + ## Create a database + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run + ## + mariadbDatabase: bitnami_joomla + + ## 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_joomla + + ## Password for mariadbUser + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run + ## + # mariadbPassword: + ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run ##