diff --git a/stable/orangehrm/Chart.yaml b/stable/orangehrm/Chart.yaml index e809113cf4..863daf5740 100644 --- a/stable/orangehrm/Chart.yaml +++ b/stable/orangehrm/Chart.yaml @@ -1,5 +1,5 @@ name: orangehrm -version: 1.0.8 +version: 2.0.0 appVersion: 4.1.0 description: OrangeHRM is a free HR management system that offers a wealth of modules to suit the needs of your business. diff --git a/stable/orangehrm/README.md b/stable/orangehrm/README.md index b8cd5c3147..7ae65ced54 100644 --- a/stable/orangehrm/README.md +++ b/stable/orangehrm/README.md @@ -75,10 +75,10 @@ The following table lists the configurable parameters of the OrangeHRM chart and | `externalDatabase.password` | Password for the above username | `nil` | | `externalDatabase.database` | Name of the existing database | `bitnami_orangehrm` | | `mariadb.enabled` | Whether to use the MariaDB chart | `true` | -| `mariadb.mariadbDatabase` | Database name to create | `bitnami_orangehrm` | -| `mariadb.mariadbUser` | Database user to create | `bn_orangehrm` | -| `mariadb.mariadbPassword` | Password for the database | `nil` | -| `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | +| `mariadb.db.name` | Database name to create | `bitnami_orangehrm` | +| `mariadb.db.user` | Database user to create | `bn_orangehrm` | +| `mariadb.db.password` | Password for the database | `nil` | +| `mariadb.rootUser.password` | MariaDB admin password | `nil` | | `mariadb.persistence.enabled` | Enable MariaDB persistence using PVC | `true` | | `mariadb.persistence.storageClass` | PVC Storage Class for MariaDB volume | `nil` (uses alpha storage class annotation) | | `mariadb.persistence.accessMode` | PVC Access Mode for MariaDB volume | `ReadWriteOnce` | diff --git a/stable/orangehrm/requirements.lock b/stable/orangehrm/requirements.lock index c64ef3099e..3bf9429306 100644 --- a/stable/orangehrm/requirements.lock +++ b/stable/orangehrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 3.0.3 -digest: sha256:cbb7adf99b46d1821f835c8f7783d600d0609d876fb6e117d5ecd3a35335ead8 -generated: 2018-05-08T11:22:56.937244223+02:00 + version: 4.2.2 +digest: sha256:b75f19f70f8a102eeda32e04c0c99dd8e635de3f3ee27e28c6f93054276e9dc1 +generated: 2018-06-11T16:42:52.022596621+02:00 diff --git a/stable/orangehrm/requirements.yaml b/stable/orangehrm/requirements.yaml index 6624958461..4ea7e0e5cc 100644 --- a/stable/orangehrm/requirements.yaml +++ b/stable/orangehrm/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 3.0.3 + version: 4.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/stable/orangehrm/templates/deployment.yaml b/stable/orangehrm/templates/deployment.yaml index cd584d8c2e..8ebe39b599 100644 --- a/stable/orangehrm/templates/deployment.yaml +++ b/stable/orangehrm/templates/deployment.yaml @@ -32,9 +32,9 @@ spec: - name: MARIADB_PORT_NUMBER value: "3306" - name: ORANGEHRM_DATABASE_NAME - value: {{ .Values.mariadb.mariadbDatabase | quote }} + value: {{ .Values.mariadb.db.name | quote }} - name: ORANGEHRM_DATABASE_USER - value: {{ .Values.mariadb.mariadbUser | quote }} + value: {{ .Values.mariadb.db.user | quote }} - name: ORANGEHRM_DATABASE_PASSWORD valueFrom: secretKeyRef: diff --git a/stable/orangehrm/values.yaml b/stable/orangehrm/values.yaml index 32206639b3..1d91f907d8 100644 --- a/stable/orangehrm/values.yaml +++ b/stable/orangehrm/values.yaml @@ -66,42 +66,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_orangehrm - - ## 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_orangehrm - - ## 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_orangehrm + user: bn_orangehrm + ## 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