diff --git a/stable/osclass/Chart.yaml b/stable/osclass/Chart.yaml index 6f895f5c5c..1c359558a9 100644 --- a/stable/osclass/Chart.yaml +++ b/stable/osclass/Chart.yaml @@ -1,5 +1,5 @@ name: osclass -version: 1.0.7 +version: 2.0.0 appVersion: 3.7.4 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. diff --git a/stable/osclass/README.md b/stable/osclass/README.md index b5a0356d84..9351de847b 100644 --- a/stable/osclass/README.md +++ b/stable/osclass/README.md @@ -81,8 +81,8 @@ The following table lists the configurable parameters of the Osclass chart and t | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_osclass` | | `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.mariadbDatabase` | Database name to create | `bitnami_osclass` | -| `mariadb.mariadbUser` | Database user to create | `bn_osclass` | +| `mariadb.db.name` | Database name to create | `bitnami_osclass` | +| `mariadb.db.user` | Database user to create | `bn_osclass` | | `mariadb.mariadbPassword` | Password for the database | `nil` | | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | | `mariadb.persistence.enabled` | Enable MariaDB persistence using PVC | `true` | diff --git a/stable/osclass/requirements.lock b/stable/osclass/requirements.lock index 88c072b75b..428ae56f81 100644 --- a/stable/osclass/requirements.lock +++ b/stable/osclass/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-15T16:14:55.447738+01:00 + version: 4.2.2 +digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 +generated: 2018-06-11T13:29:06.008264989+02:00 diff --git a/stable/osclass/requirements.yaml b/stable/osclass/requirements.yaml index 7c0c6a88a9..4ea7e0e5cc 100644 --- a/stable/osclass/requirements.yaml +++ b/stable/osclass/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/osclass/templates/deployment.yaml b/stable/osclass/templates/deployment.yaml index 2c4c17f363..cabb33b0ca 100644 --- a/stable/osclass/templates/deployment.yaml +++ b/stable/osclass/templates/deployment.yaml @@ -33,9 +33,9 @@ spec: - name: MARIADB_PORT_NUMBER value: "3306" - name: OSCLASS_DATABASE_NAME - value: {{ .Values.mariadb.mariadbDatabase | quote }} + value: {{ .Values.mariadb.db.name | quote }} - name: OSCLASS_DATABASE_USER - value: {{ .Values.mariadb.mariadbUser | quote }} + value: {{ .Values.mariadb.db.user | quote }} - name: OSCLASS_DATABASE_PASSWORD valueFrom: secretKeyRef: diff --git a/stable/osclass/values.yaml b/stable/osclass/values.yaml index 1cb0685b59..ebae5c8c09 100644 --- a/stable/osclass/values.yaml +++ b/stable/osclass/values.yaml @@ -95,42 +95,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_osclass - - ## 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_osclass - - ## 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_osclass + user: bn_osclass + ## 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: + # root: + # 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