[stable/odoo] Add global StorageClass to odoo (#16418)

Signed-off-by: Miguel A. Cabrera Minagorri <macabrera@bitnami.com>
This commit is contained in:
Miguel Ángel Cabrera Miñagorri
2019-08-20 03:49:35 -07:00
committed by Kubernetes Prow Robot
parent 93db6d8ea5
commit ac3e95ad59
5 changed files with 24 additions and 8 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: odoo
version: 10.0.3
version: 10.1.0
appVersion: 12.0.20190815
description: A suite of web based open source business apps.
home: https://www.odoo.com/
+1
View File
@@ -51,6 +51,7 @@ The following table lists the configurable parameters of the Odoo chart and thei
|---------------------------------------|-----------------------------------------------------------|---------------------------------------------------------|
| `global.imageRegistry` | Global Docker image registry | `nil` |
| `global.imagePullSecrets` | Global Docker registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `global.storageClass` | Global storage class for dynamic provisioning | `nil` |
| `image.registry` | Odoo image registry | `docker.io` |
| `image.repository` | Odoo Image name | `bitnami/odoo` |
| `image.tag` | Odoo Image tag | `{TAG_NAME}` |
+20
View File
@@ -89,3 +89,23 @@ imagePullSecrets:
{{- end }}
{{- end -}}
{{- end -}}
{{/*
Return the proper Storage Class
*/}}
{{- define "odoo.storageClass" -}}
{{- $storageClass := "" }}
{{- if .Values.persistence.storageClass -}}
{{- $storageClass = .Values.persistence.storageClass -}}
{{- end -}}
{{- if .Values.global -}}
{{- if .Values.global.storageClass -}}
{{- $storageClass = .Values.global.storageClass -}}
{{- end -}}
{{- end -}}
{{- if (eq "-" $storageClass) -}}
{{- printf "\"\"" -}}
{{- else }}
{{- printf "%s" $storageClass -}}
{{- end -}}
{{- end -}}
+1 -7
View File
@@ -14,11 +14,5 @@ spec:
resources:
requests:
storage: {{ .Values.persistence.size | quote }}
{{- if .Values.persistence.storageClass }}
{{- if (eq "-" .Values.persistence.storageClass) }}
storageClassName: ""
{{- else }}
storageClassName: {{ .Values.persistence.storageClass | quote }}
{{- end }}
{{- end }}
storageClassName: {{ include "odoo.storageClass" . }}
{{- end -}}
+1
View File
@@ -6,6 +6,7 @@
# imageRegistry: myRegistryName
# imagePullSecrets:
# - myRegistryKeySecretName
# storageClass: myStorageClass
## Bitnami Odoo image version
## ref: https://hub.docker.com/r/bitnami/odoo/tags/