From d2cf5b1c2e82e417c11d89cab55ea4f44f9738ec Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Thu, 2 Mar 2017 14:29:38 +0530 Subject: [PATCH] sugarcrm: clean ups --- incubator/sugarcrm/README.md | 4 +- incubator/sugarcrm/templates/deployment.yaml | 8 +-- incubator/sugarcrm/templates/secrets.yaml | 2 +- incubator/sugarcrm/values.yaml | 56 ++++++++------------ 4 files changed, 29 insertions(+), 41 deletions(-) diff --git a/incubator/sugarcrm/README.md b/incubator/sugarcrm/README.md index 1f5839bc8..2f1bba363 100644 --- a/incubator/sugarcrm/README.md +++ b/incubator/sugarcrm/README.md @@ -68,7 +68,7 @@ The following tables lists the configurable parameters of the SugarCRM chart and | `persistence.apache.size` | PVC Storage Request for apache volume | `1Gi` | | `persistence.sugarcrm.storageClass` | PVC Storage Class for SugarCRM volume | `nil` (uses alpha storage class annotation) | | `persistence.sugarcrm.accessMode` | PVC Access Mode for SugarCRM volume | `ReadWriteOnce` | -| `persistence.sugarcrm.size` | PVC Storage Request for SugarCRM volume | `1Gi` | +| `persistence.sugarcrm.size` | PVC Storage Request for SugarCRM volume | `8Gi` | | `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | The above parameters map to the env variables defined in [bitnami/sugarcrm](http://github.com/bitnami/bitnami-docker-sugarcrm). For more information please refer to the [bitnami/sugarcrm](http://github.com/bitnami/bitnami-docker-sugarcrm) image documentation. @@ -107,7 +107,7 @@ $ helm install --name my-release -f values.yaml stable/sugarcrm ## Persistence -The [Bitnami SugarCRM](https://github.com/bitnami/bitnami-docker-sugarcrm) image stores the SugarCRM data and configurations at the `/bitnami/sugarcrm` and the `/bitnami/apache` paths of the container. +The [Bitnami SugarCRM](https://github.com/bitnami/bitnami-docker-sugarcrm) image stores the SugarCRM data and configurations at the `/bitnami/sugarcrm` and `/bitnami/apache` paths of the container. Persistent Volume Claims are used to keep the data across deployments. This is known to work in GCE, AWS, and minikube. See the [Configuration](#configuration) section to configure the PVC or to disable persistence. diff --git a/incubator/sugarcrm/templates/deployment.yaml b/incubator/sugarcrm/templates/deployment.yaml index 59642bae3..24879c1fa 100644 --- a/incubator/sugarcrm/templates/deployment.yaml +++ b/incubator/sugarcrm/templates/deployment.yaml @@ -28,6 +28,8 @@ spec: secretKeyRef: name: {{ template "mariadb.fullname" . }} key: mariadb-root-password + - name: SUGARCRM_HOST + value: {{ include "host" . | quote }} - name: SUGARCRM_USERNAME value: {{ default "" .Values.sugarcrmUsername | quote }} - name: SUGARCRM_PASSWORD @@ -38,9 +40,7 @@ spec: - name: SUGARCRM_EMAIL value: {{ default "" .Values.sugarcrmEmail | quote }} - name: SUGARCRM_LASTNAME - value: {{ default "" .Values.sugarcrmLastname | quote }} - - name: SUGARCRM_HOST - value: {{ default "" .Values.sugarcrmHost | quote }} + value: {{ default "" .Values.sugarcrmLastName | quote }} - name: SUGARCRM_SMTP_HOST value: {{ default "" .Values.sugarcrmSmtpHost | quote }} - name: SUGARCRM_SMTP_PORT @@ -70,7 +70,7 @@ spec: path: / port: http initialDelaySeconds: 30 - timeoutSeconds: 5 + timeoutSeconds: 1 resources: {{ toYaml .Values.resources | indent 10 }} volumeMounts: diff --git a/incubator/sugarcrm/templates/secrets.yaml b/incubator/sugarcrm/templates/secrets.yaml index e41998f0e..4200622f9 100644 --- a/incubator/sugarcrm/templates/secrets.yaml +++ b/incubator/sugarcrm/templates/secrets.yaml @@ -10,7 +10,7 @@ metadata: type: Opaque data: {{- if .Values.sugarcrmPassword }} - sugarcrm-password: {{ default "" .Values.sugarcrmPassword | b64enc | quote }} + sugarcrm-password: {{ default "" .Values.sugarcrmPassword | b64enc | quote }} {{- else }} sugarcrm-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} diff --git a/incubator/sugarcrm/values.yaml b/incubator/sugarcrm/values.yaml index 92e38b800..e806f4f17 100644 --- a/incubator/sugarcrm/values.yaml +++ b/incubator/sugarcrm/values.yaml @@ -1,4 +1,4 @@ -## Bitnami sugarcrm image +## Bitnami SugarCRM image version ## ref: https://hub.docker.com/r/bitnami/sugarcrm/tags/ ## image: bitnami/sugarcrm:6.5.24-r2 @@ -8,37 +8,36 @@ image: bitnami/sugarcrm:6.5.24-r2 ## imagePullPolicy: IfNotPresent +## SugarCRM host to create application URLs +## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#configuration +## +# sugarcrmHost: + +## loadBalancerIP for the SugarCRM Service (optional, cloud specific) +## ref: http://kubernetes.io/docs/user-guide/services/#type-loadbalancer +## +# sugarcrmLoadBalancerIP: + ## User of the application -## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables +## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#configuration ## sugarcrmUsername: user ## Application password ## Defaults to a random 10-character alphanumeric string if not set -## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables -## sugarcrmPassword: - -## Lastname -## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables +## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#configuration ## -sugarcrmLastname: Name - -## loadBalancerIP for the Service (optional, cloud specific) -## ref: http://kubernetes.io/docs/user-guide/services/#type-loadbalancer -## -# sugarcrmLoadBalancerIP: +# sugarcrmPassword: ## Admin email -## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables +## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#configuration ## sugarcrmEmail: user@example.com -## SugarCRM HOST -## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables +## Last Name +## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#configuration ## -## sugarcrmHost: - - +sugarcrmLastName: LastName ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-orangehrm/#smtp-configuration @@ -52,21 +51,10 @@ sugarcrmEmail: user@example.com ## MariaDB chart configuration ## mariadb: - ## MariaDB root password + ## MariaDB admin password ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run - ## mariadbRootPassword: - - ## MariaDB user - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md - ## mariadbUser: - - ## MariaDB Host - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md - ## mariadbHost: - - ## MariaDB Port - ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md - ## mariadbPort: + ## + # mariadbRootPassword: ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/ @@ -103,7 +91,7 @@ persistence: ## # storageClass: accessMode: ReadWriteOnce - size: 1Gi + size: 8Gi ## Configure resource requests and limits ## ref: http://kubernetes.io/docs/user-guide/compute-resources/