[stable/odoo] Standardize 'fullname' and 'name' macros (#15437)

Signed-off-by: juan131 <juan@bitnami.com>
This commit is contained in:
Juan Ariza Toledano
2019-07-11 09:33:43 -07:00
committed by Kubernetes Prow Robot
parent a8633735fe
commit 9baed0405e
4 changed files with 19 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: odoo
version: 8.1.5
version: 8.1.6
appVersion: 12.0.20190615
description: A suite of web based open source business apps.
home: https://www.odoo.com/
+2
View File
@@ -56,6 +56,8 @@ The following table lists the configurable parameters of the Odoo chart and thei
| `image.tag` | Odoo Image tag | `{TAG_NAME}` |
| `image.pullPolicy` | Image pull policy | `Always` |
| `image.pullSecrets` | Specify docker-registry secret names as an array | `[]` (does not add image pull secrets to deployed pods) |
| `nameOverride` | String to partially override odoo.fullname template with a string (will prepend the release name) | `nil` |
| `fullnameOverride` | String to fully override odoo.fullname template with a string | `nil` |
| `odooUsername` | User of the application | `user@example.com` |
| `odooPassword` | Admin account password | _random 10 character long alphanumeric string_ |
| `odooEmail` | Admin account email | `user@example.com` |
+8
View File
@@ -11,9 +11,17 @@ Create a default fully qualified app name.
We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).
*/}}
{{- define "odoo.fullname" -}}
{{- if .Values.fullnameOverride -}}
{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- $name := default .Chart.Name .Values.nameOverride -}}
{{- if contains $name .Release.Name -}}
{{- .Release.Name | trunc 63 | trimSuffix "-" -}}
{{- else -}}
{{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}}
{{- end -}}
{{- end -}}
{{- end -}}
{{/*
Create a default fully qualified app name.
+8
View File
@@ -26,6 +26,14 @@ image:
# pullSecrets:
# - myRegistryKeySecretName
## String to partially override odoo.fullname template (will maintain the release name)
##
# nameOverride:
## String to fully override odoo.fullname template
##
# fullnameOverride:
## User of the application
## ref: https://github.com/bitnami/bitnami-docker-odoo#configuration
##