From 8aeb2334d725cf1379cb780d2c419780dc6abeb4 Mon Sep 17 00:00:00 2001 From: Miguel Ruiz Date: Thu, 14 Jan 2021 16:11:01 +0100 Subject: [PATCH] [bitnami/odoo] Add without demo option (#5026) * [bitnami/odoo] Add withoutDemo option * Odoo version bump * Update withoutDemo description and resize parameters table --- bitnami/odoo/Chart.yaml | 2 +- bitnami/odoo/README.md | 63 +++++++++++++------------- bitnami/odoo/templates/deployment.yaml | 2 + bitnami/odoo/values.yaml | 5 ++ 4 files changed, 40 insertions(+), 32 deletions(-) diff --git a/bitnami/odoo/Chart.yaml b/bitnami/odoo/Chart.yaml index c0ed8d326..0faf36cf5 100644 --- a/bitnami/odoo/Chart.yaml +++ b/bitnami/odoo/Chart.yaml @@ -27,4 +27,4 @@ name: odoo sources: - https://github.com/bitnami/bitnami-docker-odoo - https://www.odoo.com/ -version: 18.0.0 +version: 18.1.0 diff --git a/bitnami/odoo/README.md b/bitnami/odoo/README.md index 16bc35156..4e3eaf155 100644 --- a/bitnami/odoo/README.md +++ b/bitnami/odoo/README.md @@ -104,37 +104,38 @@ The following table lists the configurable parameters of the Odoo chart and thei ### Odoo parameters -| Parameter | Description | Default | -|--------------------------------------|-----------------------------------------------------------|------------------------------------------------| -| `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` | -| `smtpHost` | SMTP host | `nil` | -| `smtpPort` | SMTP port | `nil` | -| `smtpUser` | SMTP user | `nil` | -| `smtpPassword` | SMTP password | `nil` | -| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | -| `existingSecret` | Name of a secret with the application password | `nil` | -| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | -| `livenessProbe.enabled` | Enable/disable the liveness probe | `true` | -| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 300 | -| `livenessProbe.periodSeconds` | How often to perform the probe | 30 | -| `livenessProbe.timeoutSeconds` | When the probe times out | 5 | -| `livenessProbe.failureThreshold` | Minimum consecutive failures to be considered failed | 6 | -| `livenessProbe.successThreshold` | Minimum consecutive successes to be considered successful | 1 | -| `readinessProbe.enabled` | Enable/disable the readiness probe | `true` | -| `readinessProbe.initialDelaySeconds` | Delay before readinessProbe is initiated | 30 | -| `readinessProbe.periodSeconds ` | How often to perform the probe | 10 | -| `readinessProbe.timeoutSeconds` | When the probe times out | 5 | -| `readinessProbe.failureThreshold` | Minimum consecutive failures to be considered failed | 6 | -| `readinessProbe.successThreshold` | Minimum consecutive successes to be considered successful | 1 | -| `customLivenessProbe` | Override default liveness probe | `nil` | -| `customReadinessProbe` | Override default readiness probe | `nil` | -| `command` | Custom command to override image cmd | `nil` (evaluated as a template) | -| `args` | Custom args for the custom command | `nil` (evaluated as a template) | -| `extraEnvVars` | An array to add extra env vars | `[]` (evaluated as a template) | -| `extraEnvVarsCM` | Array to add extra configmaps | `[]` | -| `extraEnvVarsSecret` | Array to add extra environment from a Secret | `nil` | +| Parameter | Description | Default | +|--------------------------------------|--------------------------------------------------------------------|------------------------------------------------| +| `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` | +| `withoutDemo` | Disable Odoo modules demo data ('', 'all' or comma-separated list) | `all` | +| `smtpHost` | SMTP host | `nil` | +| `smtpPort` | SMTP port | `nil` | +| `smtpUser` | SMTP user | `nil` | +| `smtpPassword` | SMTP password | `nil` | +| `smtpProtocol` | SMTP protocol [`ssl`, `tls`] | `nil` | +| `existingSecret` | Name of a secret with the application password | `nil` | +| `resources` | CPU/Memory resource requests/limits | Memory: `512Mi`, CPU: `300m` | +| `livenessProbe.enabled` | Enable/disable the liveness probe | `true` | +| `livenessProbe.initialDelaySeconds` | Delay before liveness probe is initiated | 300 | +| `livenessProbe.periodSeconds` | How often to perform the probe | 30 | +| `livenessProbe.timeoutSeconds` | When the probe times out | 5 | +| `livenessProbe.failureThreshold` | Minimum consecutive failures to be considered failed | 6 | +| `livenessProbe.successThreshold` | Minimum consecutive successes to be considered successful | 1 | +| `readinessProbe.enabled` | Enable/disable the readiness probe | `true` | +| `readinessProbe.initialDelaySeconds` | Delay before readinessProbe is initiated | 30 | +| `readinessProbe.periodSeconds ` | How often to perform the probe | 10 | +| `readinessProbe.timeoutSeconds` | When the probe times out | 5 | +| `readinessProbe.failureThreshold` | Minimum consecutive failures to be considered failed | 6 | +| `readinessProbe.successThreshold` | Minimum consecutive successes to be considered successful | 1 | +| `customLivenessProbe` | Override default liveness probe | `nil` | +| `customReadinessProbe` | Override default readiness probe | `nil` | +| `command` | Custom command to override image cmd | `nil` (evaluated as a template) | +| `args` | Custom args for the custom command | `nil` (evaluated as a template) | +| `extraEnvVars` | An array to add extra env vars | `[]` (evaluated as a template) | +| `extraEnvVarsCM` | Array to add extra configmaps | `[]` | +| `extraEnvVarsSecret` | Array to add extra environment from a Secret | `nil` | ### Ingress parameters diff --git a/bitnami/odoo/templates/deployment.yaml b/bitnami/odoo/templates/deployment.yaml index 6d4ec77a7..ee07ba02a 100644 --- a/bitnami/odoo/templates/deployment.yaml +++ b/bitnami/odoo/templates/deployment.yaml @@ -78,6 +78,8 @@ spec: secretKeyRef: name: {{ template "odoo.secretName" . }} key: odoo-password + - name: WITHOUT_DEMO + value: {{ .Values.withoutDemo | quote }} {{- if .Values.smtpHost }} - name: SMTP_HOST value: {{ .Values.smtpHost | quote }} diff --git a/bitnami/odoo/values.yaml b/bitnami/odoo/values.yaml index 5a2e1ccfc..44953c93d 100644 --- a/bitnami/odoo/values.yaml +++ b/bitnami/odoo/values.yaml @@ -114,6 +114,11 @@ odooEmail: user@example.com ## # odooPassword: +## Odoo modules disable demo data +## ref: https://github.com/bitnami/bitnami-docker-odoo#configuration +## +withoutDemo: all + ## SMTP mail delivery configuration ## ref: https://github.com/bitnami/bitnami-docker-odoo/#smtp-configuration # smtpHost: