From 960bbc334d72ff35646aa5e47c72a44bed1ac97a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Tue, 12 Jun 2018 10:01:27 +0200 Subject: [PATCH] [stable/suitecrm] Use latest dependencies (#6031) * [stable/suitecrm] Use latest dependencies * Update README * Update README * Root user * Fix rootuser --- stable/suitecrm/Chart.yaml | 2 +- stable/suitecrm/README.md | 8 ++-- stable/suitecrm/requirements.lock | 6 +-- stable/suitecrm/requirements.yaml | 2 +- stable/suitecrm/templates/deployment.yaml | 4 +- stable/suitecrm/values.yaml | 50 +++++++++++------------ 6 files changed, 36 insertions(+), 36 deletions(-) diff --git a/stable/suitecrm/Chart.yaml b/stable/suitecrm/Chart.yaml index 468311fb7e..fedab1cd45 100644 --- a/stable/suitecrm/Chart.yaml +++ b/stable/suitecrm/Chart.yaml @@ -1,5 +1,5 @@ name: suitecrm -version: 1.0.6 +version: 2.0.0 appVersion: 7.10.6 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/stable/suitecrm/README.md b/stable/suitecrm/README.md index 038d48780f..477ce97955 100644 --- a/stable/suitecrm/README.md +++ b/stable/suitecrm/README.md @@ -70,10 +70,10 @@ The following table lists the configurable parameters of the SuiteCRM chart and | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_suitecrm` | | `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.mariadbDatabase` | Database name to create | `bitnami_suitecrm` | -| `mariadb.mariadbUser` | Database user to create | `bn_suitecrm` | -| `mariadb.mariadbPassword` | Password for the database | `nil` | -| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | +| `mariadb.db.name` | Database name to create | `bitnami_suitecrm` | +| `mariadb.db.user` | Database user to create | `bn_suitecrm` | +| `mariadb.db.password` | Password for the database | `nil` | +| `mariadb.rootUser.password` | 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 class annotation) | diff --git a/stable/suitecrm/requirements.lock b/stable/suitecrm/requirements.lock index c3d304d6b0..c9500152e4 100644 --- a/stable/suitecrm/requirements.lock +++ b/stable/suitecrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 0.7.0 -digest: sha256:f59f68030aa5c50b9e776b813804875fac911f91c2aa384e991f37a795c5ae34 -generated: 2018-03-15T17:44:12.005678+01:00 + version: 4.2.2 +digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 +generated: 2018-06-11T13:16:38.135950164+02:00 diff --git a/stable/suitecrm/requirements.yaml b/stable/suitecrm/requirements.yaml index 7c0c6a88a9..4ea7e0e5cc 100644 --- a/stable/suitecrm/requirements.yaml +++ b/stable/suitecrm/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 0.7.0 + version: 4.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/stable/suitecrm/templates/deployment.yaml b/stable/suitecrm/templates/deployment.yaml index 4cbf363399..3f8af4ed6d 100644 --- a/stable/suitecrm/templates/deployment.yaml +++ b/stable/suitecrm/templates/deployment.yaml @@ -34,9 +34,9 @@ spec: - name: MARIADB_PORT_NUMBER value: "3306" - name: SUITECRM_DATABASE_NAME - value: {{ .Values.mariadb.mariadbDatabase | quote }} + value: {{ .Values.mariadb.db.name | quote }} - name: SUITECRM_DATABASE_USER - value: {{ .Values.mariadb.mariadbUser | quote }} + value: {{ .Values.mariadb.db.user | quote }} - name: SUITECRM_DATABASE_PASSWORD valueFrom: secretKeyRef: diff --git a/stable/suitecrm/values.yaml b/stable/suitecrm/values.yaml index 8788392643..1193b977fb 100644 --- a/stable/suitecrm/values.yaml +++ b/stable/suitecrm/values.yaml @@ -87,42 +87,42 @@ externalDatabase: 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 + ## Disable MariaDB replication + replication: + enabled: false - ## Create a database - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-on-first-run - ## - mariadbDatabase: bitnami_suitecrm - - ## Create a database user + ## 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 ## - mariadbUser: bn_suitecrm - - ## Password for mariadbUser - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#creating-a-database-user-on-first-run - ## - # mariadbPassword: + db: + name: bitnami_suitecrm + user: bn_suitecrm + ## 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: + # 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