From 97260c22c7d1481deca693b02e9cb76a0107d1fe Mon Sep 17 00:00:00 2001 From: Karl Southern Date: Mon, 17 Jun 2024 11:46:00 +0100 Subject: [PATCH] fix(odoo): extraManifests was broken and didn't follow general conventions --- charts/odoo/README.md | 2 +- charts/odoo/templates/extra.yaml | 7 ++++--- charts/odoo/values.yaml | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/charts/odoo/README.md b/charts/odoo/README.md index 9a9d658..b1b5859 100644 --- a/charts/odoo/README.md +++ b/charts/odoo/README.md @@ -44,7 +44,7 @@ $ helm install my-release glodo/odoo -f ./helm-values.yaml | config.smtp.ssl | string | `"false"` | sets odoo configuration smtp_ssl | | config.smtp.user | string | `"false"` | sets odoo configuration smtp_user | | config.withoutDemo | string | `"true"` | sets odoo configuration without_demo | -| extraManifests | string | `""` | Use extraManifests (string) to add. This is run through the templating system, and may be useful to create custom additional deployments, statefulsets, etc. that need a "rollme" annotation changed to force redeployment after changes are made. | +| extraManifests | list | `[]` | Use extraManifests (list) to add | | image.pullPolicy | string | `"IfNotPresent"` | container pullPolicy | | image.repository | string | `"glodouk/CHANGEME"` | container image | | image.tag | string | `""` | container tag | diff --git a/charts/odoo/templates/extra.yaml b/charts/odoo/templates/extra.yaml index f06495c..567f7bf 100644 --- a/charts/odoo/templates/extra.yaml +++ b/charts/odoo/templates/extra.yaml @@ -1,3 +1,4 @@ -{{- if .Values.extraManifests }} -{{ tpl .Values.extraManifests }} -{{- end }} +{{ range .Values.extraManifests }} +--- +{{ tpl (toYaml .) $ }} +{{ end }} diff --git a/charts/odoo/values.yaml b/charts/odoo/values.yaml index 8ee0d39..6e7ec0f 100644 --- a/charts/odoo/values.yaml +++ b/charts/odoo/values.yaml @@ -399,8 +399,8 @@ upgrade: # -- customisable arguments for click-odoo-update clickArgs: "--ignore-core-addons" -# -- Use extraManifests (string) to add. This is run through the templating system, and may be useful to create custom additional deployments, statefulsets, etc. that need a "rollme" annotation changed to force redeployment after changes are made. -extraManifests: "" +# -- Use extraManifests (list) to add +extraManifests: [] velero: # -- enable creation of velero schedule