diff --git a/incubator/sugarcrm/Chart.yaml b/incubator/sugarcrm/Chart.yaml index 53d014a7b..9a8a05a05 100644 --- a/incubator/sugarcrm/Chart.yaml +++ b/incubator/sugarcrm/Chart.yaml @@ -1,11 +1,9 @@ name: sugarcrm -version: 0.0.1 +version: 0.1.0 description: Sugar offers the most innovative, flexible and affordable CRM in the market and delivers the best all-around value of any CRM. keywords: - sugarcrm - CRM -- php -- mariadb home: http://www.sugarcrm.org/ sources: - https://github.com/bitnami/bitnami-docker-sugarcrm diff --git a/incubator/sugarcrm/README.md b/incubator/sugarcrm/README.md index a28e585a4..b9f87cdf4 100644 --- a/incubator/sugarcrm/README.md +++ b/incubator/sugarcrm/README.md @@ -47,15 +47,16 @@ The following tables lists the configurable parameters of the sugarcrm chart and | Parameter | Description | Default | |--------------------------------------|------------------------------------------|---------------------------------------------------------| -| `image` | sugarcrm image | `bitnami/sugarcrm:{VERSION}` | -| `imageTag` | sugarcrm image Tag | `3.1.3` | +| `image` | sugarcrm image | `bitnami/sugarcrm:{VERSION}` | +| `imageTag` | sugarcrm image Tag | `3.1.3` | | `imagePullPolicy` | Image pull policy | `Always` if `imageTag` is `latest`, else `IfNotPresent` | -| `sugarcrmUser` | User of the application | `user` | -| `sugarcrmPassword` | Application password | _random 10 character long alphanumeric string_ | -| `sugarcrmEmail` | Admin email | `user@example.com` | +| `sugarcrmUsername` | User of the application | `user` | +| `sugarcrmPassword` | Application password | _random 10 character long alphanumeric string_ | +| `sugarcrmEmail` | Admin email | `user@example.com` | +| `sugarcrmHost` | Host domain or IP | `nil` | | `smtpHost` | SMTP host | `nil` | | `smtpPort` | SMTP port | `nil` | -| `smtpHostID` | SMTP host ID | `nil` | +| `smtpProtocol` | SMTP Protocol | `nil` | | `smtpUser` | SMTP user | `nil` | | `smtpPassword` | SMTP password | `nil` | | `mariadb.mariadbRootPassword` | MariaDB admin password | `nil` | @@ -64,9 +65,9 @@ The following tables lists the configurable parameters of the sugarcrm chart and | `persistence.apache.storageClass` | PVC Storage Class for Apache volume | `generic` | | `persistence.apache.accessMode` | PVC Access Mode for Apache volume | `ReadWriteOnce` | | `persistence.apache.size` | PVC Storage Request for Apache volume | `1Gi` | -| `persistence.sugarcrm.storageClass` | PVC Storage Class for sugarcrm volume | `generic` | -| `persistence.sugarcrm.accessMode` | PVC Access Mode for sugarcrm volume | `ReadWriteOnce` | -| `persistence.sugarcrm.size` | PVC Storage Request for sugarcrm volume | `8Gi` | +| `persistence.sugarcrm.storageClass` | PVC Storage Class for sugarcrm volume | `generic` | +| `persistence.sugarcrm.accessMode` | PVC Access Mode for sugarcrm volume | `ReadWriteOnce` | +| `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. diff --git a/incubator/sugarcrm/templates/NOTES.txt b/incubator/sugarcrm/templates/NOTES.txt index 83271f5a4..3f9b24273 100644 --- a/incubator/sugarcrm/templates/NOTES.txt +++ b/incubator/sugarcrm/templates/NOTES.txt @@ -10,7 +10,7 @@ {{- else if contains "LoadBalancer" .Values.serviceType }} NOTE: It may take a few minutes for the LoadBalancer IP to be available. - Watch the status with: 'kubectl get svc -w {{ template "fullname" . }}' + Watch the status with: 'kubectl get svc -w {{ template "fullname" . }} --namespace {{ .Release.Namespace }}' export SERVICE_IP=$(kubectl get svc --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}') echo http://$SERVICE_IP/ @@ -23,5 +23,5 @@ 2. Get your sugarcrm login credentials by running: - echo Username: {{ .Values.sugarcrmUser }} + echo Username: {{ .Values.sugarcrmUsername }} echo Password: $(printf $(printf '\%o' `kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.sugarcrm-password[*]}"`)) diff --git a/incubator/sugarcrm/templates/apache-pvc.yaml b/incubator/sugarcrm/templates/apache-pvc.yaml index c4cbd9e11..39fd68974 100644 --- a/incubator/sugarcrm/templates/apache-pvc.yaml +++ b/incubator/sugarcrm/templates/apache-pvc.yaml @@ -3,6 +3,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ template "fullname" . }}-apache + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.apache.storageClass | quote }} spec: diff --git a/incubator/sugarcrm/templates/deployment.yaml b/incubator/sugarcrm/templates/deployment.yaml index 58fa37b20..54a5b4d09 100644 --- a/incubator/sugarcrm/templates/deployment.yaml +++ b/incubator/sugarcrm/templates/deployment.yaml @@ -16,7 +16,7 @@ spec: spec: containers: - name: {{ template "fullname" . }} - image: "{{ .Values.image }}" + image: "{{ .Values.image }}:{{ .Values.imageTag }}" imagePullPolicy: {{ default "" .Values.imagePullPolicy | quote }} env: - name: MARIADB_HOST @@ -29,7 +29,7 @@ spec: name: {{ template "mariadb.fullname" . }} key: mariadb-root-password - name: SUGARCRM_USERNAME - value: {{ default "" .Values.sugarcrmUser | quote }} + value: {{ default "" .Values.sugarcrmUsername | quote }} - name: SUGARCRM_PASSWORD valueFrom: secretKeyRef: @@ -69,7 +69,7 @@ spec: httpGet: path: / port: http - initialDelaySeconds: 60 + initialDelaySeconds: 30 timeoutSeconds: 5 resources: {{ toYaml .Values.resources | indent 10 }} diff --git a/incubator/sugarcrm/templates/secrets.yaml b/incubator/sugarcrm/templates/secrets.yaml index 5bf823886..b185058e0 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: {{ .Values.sugarcrmPassword | b64enc | quote }} + sugarcrm-password: {{ default "" .Values.sugarcrmPassword | b64enc | quote }} {{- else }} sugarcrm-password: {{ randAlphaNum 10 | b64enc | quote }} {{- end }} diff --git a/incubator/sugarcrm/templates/sugarcrm-pvc.yaml b/incubator/sugarcrm/templates/sugarcrm-pvc.yaml index fcf561c7d..a4d683f8f 100644 --- a/incubator/sugarcrm/templates/sugarcrm-pvc.yaml +++ b/incubator/sugarcrm/templates/sugarcrm-pvc.yaml @@ -3,6 +3,11 @@ kind: PersistentVolumeClaim apiVersion: v1 metadata: name: {{ template "fullname" . }}-sugarcrm + labels: + app: {{ template "fullname" . }} + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + release: "{{ .Release.Name }}" + heritage: "{{ .Release.Service }}" annotations: volume.alpha.kubernetes.io/storage-class: {{ .Values.persistence.sugarcrm.storageClass | quote }} spec: diff --git a/incubator/sugarcrm/values.yaml b/incubator/sugarcrm/values.yaml index 5a974c188..44f256390 100644 --- a/incubator/sugarcrm/values.yaml +++ b/incubator/sugarcrm/values.yaml @@ -1,8 +1,13 @@ -## Bitnami sugarcrm image version +## Bitnami sugarcrm image ## ref: https://hub.docker.com/r/bitnami/sugarcrm/tags/ ## image: bitnami/sugarcrm +## Bitnami sugarcrm image tags +## ref: https://hub.docker.com/r/bitnami/sugarcrm/tags/ +## +imageTag: 6.5.24-r2 + ## Specify a imagePullPolicy ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images @@ -12,12 +17,12 @@ image: bitnami/sugarcrm ## User of the application ## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables ## -sugarcrmUser: user +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: bitnami +## sugarcrmPassword: ## Admin email ## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables @@ -27,7 +32,7 @@ sugarcrmEmail: user@example.com ## SugarCRM HOST ## ref: https://github.com/bitnami/bitnami-docker-sugarcrm#environment-variables ## -sugarcrmHost: +## sugarcrmHost: @@ -45,9 +50,21 @@ sugarcrmHost: ## MariaDB chart configuration ## mariadb: - ## MariaDB admin password + ## MariaDB root password ## ref: https://github.com/bitnami/bitnami-docker-mariadb/blob/master/README.md#setting-the-root-password-on-first-run - ## mariadbRootPassword: secretpassword + ## 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: ## Enable persistence using Persistent Volume Claims ## ref: http://kubernetes.io/docs/user-guide/persistent-volumes/