diff --git a/stable/drupal/Chart.yaml b/stable/drupal/Chart.yaml index 7cf743bbec..fb379f8ccf 100644 --- a/stable/drupal/Chart.yaml +++ b/stable/drupal/Chart.yaml @@ -1,5 +1,5 @@ name: drupal -version: 0.11.19 +version: 1.0.0 appVersion: 8.5.4 description: One of the most versatile open source content management systems. keywords: diff --git a/stable/drupal/README.md b/stable/drupal/README.md index cbfb7496bf..18d96e6a0b 100644 --- a/stable/drupal/README.md +++ b/stable/drupal/README.md @@ -66,10 +66,10 @@ The following table lists the configurable parameters of the Drupal chart and th | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_drupal` | | `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | -| `mariadb.mariadbDatabase` | Database name to create | `bitnami_drupal` | -| `mariadb.mariadbUser` | Database user to create | `bn_drupal` | -| `mariadb.mariadbPassword` | Password for the database | _random 10 character long alphanumeric string_ | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | +| `mariadb.db.name` | Database name to create | `bitnami_drupal` | +| `mariadb.db.user` | Database user to create | `bn_drupal` | +| `mariadb.db.password` | Password for the database | _random 10 character long alphanumeric string_ | | `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 class annotation) | diff --git a/stable/drupal/requirements.lock b/stable/drupal/requirements.lock index 3a43533470..7e9ba661a6 100644 --- a/stable/drupal/requirements.lock +++ b/stable/drupal/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 1.0.5 -digest: sha256:784a2dfb3f8c0a334cfb6dd31381ea39bd5a3834f12d95f24aa074be558388e1 -generated: 2017-12-05T17:15:55.281989+01:00 + version: 4.2.2 +digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 +generated: 2018-06-11T15:20:43.790656005+02:00 diff --git a/stable/drupal/requirements.yaml b/stable/drupal/requirements.yaml index 7f4538dc69..4ea7e0e5cc 100644 --- a/stable/drupal/requirements.yaml +++ b/stable/drupal/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 1.0.5 + version: 4.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/stable/drupal/templates/deployment.yaml b/stable/drupal/templates/deployment.yaml index 9fdc50a7ea..a1e2388724 100644 --- a/stable/drupal/templates/deployment.yaml +++ b/stable/drupal/templates/deployment.yaml @@ -41,13 +41,13 @@ spec: value: "3306" - name: DRUPAL_DATABASE_NAME {{- if .Values.mariadb.enabled }} - value: {{ default "" .Values.mariadb.mariadbDatabase | quote }} + value: {{ default "" .Values.mariadb.db.name | quote }} {{- else }} value: {{ default "" .Values.externalDatabase.database | quote }} {{- end }} - name: DRUPAL_DATABASE_USER {{- if .Values.mariadb.enabled }} - value: {{ default "" .Values.mariadb.mariadbUser | quote }} + value: {{ default "" .Values.mariadb.db.user | quote }} {{- else }} value: {{ default "" .Values.externalDatabase.user | quote }} {{- end }} diff --git a/stable/drupal/values.yaml b/stable/drupal/values.yaml index e4c55f8687..d9cb1ab4f9 100644 --- a/stable/drupal/values.yaml +++ b/stable/drupal/values.yaml @@ -57,44 +57,44 @@ externalDatabase: ## MariaDB chart configuration ## mariadb: - ## Whether to use the database specified as a requirement or not. For example, to configure the chart with an existing database server. + ## 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 + ## Disable MariaDB replication + replication: + enabled: false + + ## Create a database and a database user + ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run + ## + db: + name: bitnami_drupal + user: bn_drupal + ## If the password is not specified, mariadb will generates a random password + ## + # password: ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run ## - # mariadbRootPassword: - - ## Create a database - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run - ## - mariadbDatabase: bitnami_drupal - - ## 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_drupal - - ## Password for mariadbUser - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run - ## - # mariadbPassword: + # rootUser: + # password: ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ ## - persistence: - enabled: true - ## mariadb data Persistent Volume Storage Class - ## If defined, storageClassName: - ## If set to "-", storageClassName: "", which disables dynamic provisioning - ## If undefined (the default) or set to null, no storageClassName spec is - ## set, choosing the default provisioner. (gp2 on AWS, standard on - ## GKE, AWS & OpenStack) - ## - # storageClass: "-" - accessMode: ReadWriteOnce - size: 8Gi + master: + persistence: + enabled: true + ## mariadb data Persistent Volume Storage Class + ## If defined, storageClassName: + ## If set to "-", storageClassName: "", which disables dynamic provisioning + ## If undefined (the default) or set to null, no storageClassName spec is + ## set, choosing the default provisioner. (gp2 on AWS, standard on + ## GKE, AWS & OpenStack) + ## + # storageClass: "-" + accessMode: ReadWriteOnce + size: 8Gi ## Kubernetes configuration ## For minikube, set this to NodePort, elsewhere use LoadBalancer