From 12076a3c395c6dc1a1c558802819229a7eb8a508 Mon Sep 17 00:00:00 2001 From: Xstar97TheNoob <9399967+xstar97@users.noreply.github.com> Date: Sat, 16 Sep 2023 04:47:02 -0400 Subject: [PATCH] fix(odoo) odoo rootless (#11906) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit **Description** default to rootless + remove dbfilter ⚒️ Fixes # **⚙️ Type of change** - [ ] ⚙️ Feature/App addition - [X] 🪛 Bugfix - [ ] ⚠️ Breaking change (fix or feature that would cause existing functionality to not work as expected) - [X] 🔃 Refactor of current code **🧪 How Has This Been Tested?** **📃 Notes:** **✔️ Checklist:** - [X] ⚖️ My code follows the style guidelines of this project - [X] 👀 I have performed a self-review of my own code - [ ] #️⃣ I have commented my code, particularly in hard-to-understand areas - [ ] 📄 I have made corresponding changes to the documentation - [ ] ⚠️ My changes generate no new warnings - [ ] 🧪 I have added tests to this description that prove my fix is effective or that my feature works - [X] ⬆️ I increased versions for any altered app according to semantic versioning **➕ App addition** If this PR is an app addition please make sure you have done the following. - [ ] 🪞 I have opened a PR on [truecharts/containers](https://github.com/truecharts/containers) adding the container to TrueCharts mirror repo. - [ ] 🖼️ I have added an icon in the Chart's root directory called `icon.png` --- _Please don't blindly check all the boxes. Read them and only check those that apply. Those checkboxes are there for the reviewer to see what is this all about and the status of this PR with a quick glance._ --- charts/incubator/odoo/Chart.yaml | 2 +- charts/incubator/odoo/questions.yaml | 31 ++++---- .../incubator/odoo/templates/_configmap.tpl | 76 +++++++++---------- charts/incubator/odoo/values.yaml | 36 +++++---- 4 files changed, 73 insertions(+), 72 deletions(-) diff --git a/charts/incubator/odoo/Chart.yaml b/charts/incubator/odoo/Chart.yaml index 30e839bf1dc..b6a12188547 100644 --- a/charts/incubator/odoo/Chart.yaml +++ b/charts/incubator/odoo/Chart.yaml @@ -26,7 +26,7 @@ sources: - https://github.com/truecharts/charts/tree/master/charts/incubator/odoo - https://github.com/odoo/docker type: application -version: 14.0.0 +version: 14.0.1 annotations: truecharts.org/catagories: | - media diff --git a/charts/incubator/odoo/questions.yaml b/charts/incubator/odoo/questions.yaml index 575e4927fb3..08635c01cda 100644 --- a/charts/incubator/odoo/questions.yaml +++ b/charts/incubator/odoo/questions.yaml @@ -34,18 +34,6 @@ questions: required: true private: true default: "" - - variable: db - label: DB Configuration - schema: - additional_attrs: true - type: dict - attrs: - - variable: filter - label: DB Filter - schema: - type: string - required: true - default: "^mycompany.*$" - variable: smtp label: SMTP Configuration schema: @@ -108,9 +96,9 @@ questions: type: int default: 8069 required: true - - variable: odoo - label: "Odoo Service" - description: "Odoo Services" + - variable: xmlrpcs + label: "XMLR PCS Service" + description: "XMLR PCS Service" schema: additional_attrs: true type: dict @@ -130,6 +118,15 @@ questions: type: int default: 8071 required: true + - variable: longpolling + label: "Long Polling Service" + description: "Long Polling Service" + schema: + additional_attrs: true + type: dict + attrs: +# Include{serviceSelectorLoadBalancer} +# Include{serviceSelectorExtras} - variable: longpolling label: "Long Polling Service Port Configuration" schema: @@ -183,13 +180,13 @@ questions: description: "The UserID of the user running the application" schema: type: int - default: 0 + default: 568 - variable: runAsGroup label: "runAsGroup" description: "The groupID this App of the user running the application" schema: type: int - default: 0 + default: 568 # Include{securityContextContainer} # Include{securityContextAdvanced} # Include{securityContextPod} diff --git a/charts/incubator/odoo/templates/_configmap.tpl b/charts/incubator/odoo/templates/_configmap.tpl index 19a05c659bd..2bbf1e1a252 100644 --- a/charts/incubator/odoo/templates/_configmap.tpl +++ b/charts/incubator/odoo/templates/_configmap.tpl @@ -3,56 +3,50 @@ {{- $fullname := (include "tc.v1.common.lib.chart.names.fullname" $) -}} {{- $admin := .Values.odoo.admin -}} -{{- $db := .Values.odoo.db -}} {{- $smtp := .Values.odoo.smtp -}} {{- $pgdb := .Values.cnpg.main.database -}} {{- $pguser := .Values.cnpg.main.user -}} {{- $pgpassword := .Values.cnpg.main.creds.password | trimAll "\"" -}} -{{- $pghost := .Values.cnpg.main.creds.host | trimAll "\"" -}} +{{- $pghost := .Values.cnpg.main.creds.host -}} odoo-config: enabled: true data: odoo.conf: | - [options] - addons_path = {{ .Values.persistence.addons.mountPath }} - data_dir = {{ .Values.persistence.odoo.mountPath }} - admin_passwd = {{ $admin.passwd }} - longpolling_port = {{ .Values.service.odoo.ports.longpolling.port }} - xmlrpc = True - xmlrpc_interface = - xmlrpc_port = {{ .Values.service.main.ports.main.port }} - xmlrpcs = True - xmlrpcs_interface = - xmlrpcs_port = {{ .Values.service.odoo.ports.xmlrpcs.port }} - db_host = {{ $pghost }} - db_port = 5432 - db_user = {{ $pguser }} - db_password = {{ $pgpassword }} - dbfilter = {{ $db.dbfilter }} - csv_internal_sep = , - db_maxconn = 64 - debug_mode = False - limit_memory_hard = 2684354560 - limit_memory_soft = 2147483648 - limit_request = 8192 - limit_time_cpu = 60 - limit_time_real = 120 - list_db = True - log_db = False - log_handler = [':INFO'] - log_level = info - logfile = None - max_cron_threads = 2 - osv_memory_age_limit = 1.0 - osv_memory_count_limit = False - smtp_server = {{ $smtp.server }} - smtp_port = {{ $smtp.port }} - smtp_user = {{ $smtp.user }} - smtp_password = {{ $smtp.password }} - smtp_ssl = {{ $smtp.ssl }} - email_from = {{ $smtp.from }} - workers = 0 + [options] + addons_path = {{ .Values.persistence.addons.mountPath }} + data_dir = {{ .Values.persistence.odoo.mountPath }} + admin_passwd = {{ $admin.passwd }} + longpolling_port = {{ .Values.service.longpolling.ports.longpolling.port }} + xmlrpc = True + xmlrpc_interface = + xmlrpc_port = {{ .Values.service.main.ports.main.port }} + xmlrpcs = True + xmlrpcs_interface = + xmlrpcs_port = {{ .Values.service.xmlrpcs.ports.xmlrpcs.port }} + csv_internal_sep = , + db_maxconn = 64 + debug_mode = False + limit_memory_hard = 2684354560 + limit_memory_soft = 2147483648 + limit_request = 8192 + limit_time_cpu = 60 + limit_time_real = 120 + list_db = True + log_db = False + log_handler = [':INFO'] + log_level = info + logfile = None + max_cron_threads = 2 + osv_memory_age_limit = 1.0 + osv_memory_count_limit = False + smtp_server = {{ $smtp.server }} + smtp_port = {{ $smtp.port }} + smtp_user = {{ $smtp.user }} + smtp_password = {{ $smtp.password }} + smtp_ssl = {{ $smtp.ssl }} + email_from = {{ $smtp.from }} + workers = 0 {{- end -}} diff --git a/charts/incubator/odoo/values.yaml b/charts/incubator/odoo/values.yaml index 7afcc7b0cca..e6008c6c456 100644 --- a/charts/incubator/odoo/values.yaml +++ b/charts/incubator/odoo/values.yaml @@ -1,35 +1,29 @@ image: repository: tccr.io/truecharts/odoo pullPolicy: IfNotPresent - tag: v16.0.0@sha256:c1936984eeb8f504f5ebe74cf972319d6cd619ecbdf09249179ecdee2feeecf3 - -# test for root -securityContext: - container: - runAsNonRoot: false - readOnlyRootFilesystem: false - runAsUser: 0 - runAsGroup: 0 + tag: v16.0.0@sha256:9a0e0d913dc6c4ed5904ae233dc2de7fa1a00f10eb5a66f21e1f695c62933a1d service: main: ports: main: port: 8069 - odoo: + xmlrpcs: enabled: true ports: xmlrpcs: enabled: true port: 8071 + longpolling: + enabled: true + ports: longpolling: enabled: true port: 8072 + odoo: admin: passwd: admin - db: - filter: ^mycompany.*$ smtp: server: "" port: 587 @@ -38,6 +32,23 @@ odoo: ssl: "False" from: "" +workload: + main: + podSpec: + containers: + main: + env: + USER: "{{ .Values.cnpg.main.user }}" + PORT: 5432 + PASSWORD: + secretKeyRef: + name: cnpg-main-user + key: password + HOST: + secretKeyRef: + name: cnpg-main-urls + key: host + persistence: odoo: enabled: true @@ -54,7 +65,6 @@ persistence: main: mountPath: /etc/odoo/odoo.conf subPath: odoo.conf - readOnly: true # Enabled postgres cnpg: