Publish new changes in catalog

community/odoo/1.0.4/Chart.lock

@@ -1,6 +0,0 @@
-dependencies:
-- name: common
-  repository: file://../../../common
-  version: 1.2.2
-digest: sha256:fb077cb81f6acecd5c9e6adc22a18e156f780cd78f27198cdb47810f95364b56
-generated: "2023-11-09T15:42:20.921603595+02:00"

community/odoo/1.0.4/ci/basic-values.yaml

@@ -1,16 +0,0 @@
-odooNetwork:
-  webPort: 31000
-
-odooStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  addons:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/addons
-  pgData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgData
-  pgBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgBackup

community/odoo/1.0.4/ci/extra-values.yaml

@@ -1,23 +0,0 @@
-odooNetwork:
-  webPort: 31000
-
-odooConfig:
-  additionalConf:
-    - key: workers
-      value: "0"
-    - key: log_level
-      value: "info"
-
-odooStorage:
-  data:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/data
-  addons:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/addons
-  pgData:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgData
-  pgBackup:
-    type: hostPath
-    hostPath: /mnt/{{ .Release.Name }}/pgBackup

community/odoo/1.0.4/questions.yaml

@@ -1,302 +0,0 @@
-groups:
-  - name: Odoo Configuration
-    description: Configure Odoo
-  - name: Network Configuration
-    description: Configure Network for Odoo
-  - name: Storage Configuration
-    description: Configure Storage for Odoo
-  - name: Resources Configuration
-    description: Configure Resources for Odoo
-
-portals:
-  web_portal:
-    protocols:
-      - "$kubernetes-resource_configmap_portal_protocol"
-    host:
-      - "$kubernetes-resource_configmap_portal_host"
-    ports:
-      - "$kubernetes-resource_configmap_portal_port"
-    path: "$kubernetes-resource_configmap_portal_path"
-
-questions:
-
-  - variable: odooConfig
-    label: ""
-    group: Odoo Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: additionalConf
-          label: Additional File Configuration Options
-          description: |
-            Configure additional file configuration options for Odoo.</br>
-            Options are appended to the end of the configuration file.</br>
-            After the predefined configuration options.</br>
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: conf
-                label: Configuration Option
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: key
-                      label: Key
-                      schema:
-                        type: string
-                        required: true
-                    - variable: value
-                      label: Value
-                      schema:
-                        type: string
-                        required: true
-        - variable: additionalEnvs
-          label: Additional Environment Variables
-          description: Configure additional environment variables for Odoo.
-          schema:
-            type: list
-            default: []
-            items:
-              - variable: env
-                label: Environment Variable
-                schema:
-                  type: dict
-                  attrs:
-                    - variable: name
-                      label: Name
-                      schema:
-                        type: string
-                        required: true
-                    - variable: value
-                      label: Value
-                      schema:
-                        type: string
-                        required: true
-
-  - variable: odooNetwork
-    label: ""
-    group: Network Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: webPort
-          label: Web Port
-          description: The port for the Odoo WebUI.
-          schema:
-            type: int
-            default: 30062
-            min: 9000
-            max: 65535
-            required: true
-        - variable: hostNetwork
-          label: Host Network
-          description: |
-            Bind to the host network. It's recommended to keep this disabled.
-          schema:
-            type: boolean
-            default: false
-
-  - variable: odooStorage
-    label: ""
-    group: Storage Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: data
-          label: Odoo Data Storage
-          description: The path to store Odoo data.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  Host Path: Is a path that already exists on the system.
-                schema:
-                  type: string
-                  required: true
-                  immutable: true
-                  default: ixVolume
-                  enum:
-                    - value: hostPath
-                      description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
-                      description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
-                schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: data
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
-        - variable: addons
-          label: Odoo Addons Storage
-          description: The path to store Odoo addons storage.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  Host Path: Is a path that already exists on the system.
-                schema:
-                  type: string
-                  required: true
-                  immutable: true
-                  default: ixVolume
-                  enum:
-                    - value: hostPath
-                      description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
-                      description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
-                schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: addons
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
-        - variable: pgData
-          label: Odoo Postgres Data Storage
-          description: The path to store Odoo Postgres Data.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  Host Path: Is a path that already exists on the system.
-                schema:
-                  type: string
-                  required: true
-                  immutable: true
-                  default: ixVolume
-                  enum:
-                    - value: hostPath
-                      description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
-                      description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
-                schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: pgData
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
-        - variable: pgBackup
-          label: Odoo Postgres Backup Storage
-          description: The path to store Odoo Postgres Backup.
-          schema:
-            type: dict
-            attrs:
-              - variable: type
-                label: Type
-                description: |
-                  ixVolume: Is dataset created automatically by the system.</br>
-                  Host Path: Is a path that already exists on the system.
-                schema:
-                  type: string
-                  required: true
-                  immutable: true
-                  default: ixVolume
-                  enum:
-                    - value: hostPath
-                      description: Host Path (Path that already exists on the system)
-                    - value: ixVolume
-                      description: ixVolume (Dataset created automatically by the system)
-              - variable: datasetName
-                label: Dataset Name
-                schema:
-                  type: string
-                  show_if: [["type", "=", "ixVolume"]]
-                  required: true
-                  hidden: true
-                  immutable: true
-                  default: pgBackup
-                  $ref:
-                    - "normalize/ixVolume"
-              - variable: hostPath
-                label: Host Path
-                schema:
-                  type: hostpath
-                  show_if: [["type", "=", "hostPath"]]
-                  immutable: true
-                  required: true
-
-  - variable: resources
-    label: ""
-    group: Resources Configuration
-    schema:
-      type: dict
-      attrs:
-        - variable: limits
-          label: Limits
-          schema:
-            type: dict
-            attrs:
-              - variable: cpu
-                label: CPU
-                description: CPU limit for Odoo.
-                schema:
-                  type: string
-                  max_length: 6
-                  valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$'
-                  valid_chars_error: |
-                    Valid CPU limit formats are</br>
-                    - Plain Integer - eg. 1</br>
-                    - Float - eg. 0.5</br>
-                    - Milicpu - eg. 500m
-                  default: "4000m"
-                  required: true
-              - variable: memory
-                label: Memory
-                description: Memory limit for Odoo.
-                schema:
-                  type: string
-                  max_length: 12
-                  valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$'
-                  valid_chars_error: |
-                    Valid Memory limit formats are</br>
-                    - Suffixed with E/P/T/G/M/K - eg. 1G</br>
-                    - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi</br>
-                    - Plain Integer in bytes - eg. 1024</br>
-                    - Exponent - eg. 134e6
-                  default: "8Gi"
-                  required: true

community/odoo/1.0.4/templates/_persistence.tpl

@@ -1,58 +0,0 @@
-{{- define "odoo.persistence" -}}
-persistence:
-  data:
-    enabled: true
-    type: {{ .Values.odooStorage.data.type }}
-    datasetName: {{ .Values.odooStorage.data.datasetName | default "" }}
-    hostPath: {{ .Values.odooStorage.data.hostPath | default "" }}
-    targetSelector:
-      odoo:
-        odoo:
-          mountPath: /var/lib/odoo
-        01-permissions:
-          mountPath: /mnt/directories/odoo_data
-        03-db-init:
-          mountPath: /var/lib/odoo
-  addons:
-    enabled: true
-    type: {{ .Values.odooStorage.addons.type }}
-    datasetName: {{ .Values.odooStorage.addons.datasetName | default "" }}
-    hostPath: {{ .Values.odooStorage.addons.hostPath | default "" }}
-    targetSelector:
-      odoo:
-        odoo:
-          mountPath: /mnt/extra-addons
-        01-permissions:
-          mountPath: /mnt/directories/odoo_addons
-        03-db-init:
-          mountPath: /mnt/extra-addons
-  tmp:
-    enabled: true
-    type: emptyDir
-    targetSelector:
-      odoo:
-        odoo:
-          mountPath: /tmp
-        03-db-init:
-          mountPath: /tmp
-
-  config:
-    enabled: true
-    type: secret
-    objectName: odoo-config
-    targetSelector:
-      odoo:
-        odoo:
-          mountPath: /etc/odoo/odoo.conf
-          readOnly: true
-          subPath: odoo.conf
-        03-db-init:
-          mountPath: /etc/odoo/odoo.conf
-          readOnly: true
-          subPath: odoo.conf
-
-  {{- include "ix.v1.common.app.postgresPersistence"
-      (dict "pgData" .Values.odooStorage.pgData
-            "pgBackup" .Values.odooStorage.pgBackup
-      ) | nindent 2 }}
-{{- end -}}

community/odoo/1.1.0/Chart.lock

@@ -0,0 +1,6 @@
+dependencies:
+- name: common
+  repository: file://../../../common
+  version: 1.2.3
+digest: sha256:e6ff49b06bf5d4d159e505ae6d153f36cd46170bb519caf90462cd5caebfd0fb
+generated: "2023-11-15T18:40:05.852239091+02:00"

community/odoo/1.0.4/Chart.yaml → community/odoo/1.1.0/Chart.yaml

@@ -3,7 +3,7 @@ description: Odoo is a suite of web based open source business apps.
 annotations:
   title: Odoo
 type: application
-version: 1.0.4
+version: 1.1.0
 apiVersion: v2
 appVersion: '16.0'
 kubeVersion: '>=1.16.0-0'
@@ -14,7 +14,7 @@ maintainers:
 dependencies:
   - name: common
     repository: file://../../../common
-    version: 1.2.2
+    version: 1.2.3
 home: https://www.odoo.com/
 icon: https://media.sys.truenas.net/apps/odoo/icons/icon.png
 sources:

community/odoo/1.0.4/README.md → community/odoo/1.1.0/README.md

@@ -3,10 +3,9 @@
 [Odoo](https://odoo.com) is a suite of web based open source business apps.
 
 > When application is installed, a container will be launched with **root** privileges.
-> This is required in order to apply the correct permissions to the `odoo` directories.
-> Afterward, the `odoo` container will run as a **non**-root user (`101`).
-> Same applies to the `postgres` container. This will run afterwards as a **non**-root user (`999`).
+> This is required in order to apply the correct permissions to the `postgres` directories.
+> Afterwards `postgres` will run afterwards as a **non**-root user (`999`).
 > On each upgrade, a container will be launched with **root** privileges in order to apply the correct
 > permissions to the `postgres` **backups** directory. Container that performs the backup will run as a **non**-root user (`999`) afterwards.
 > Keep in mind the permissions on the backup directory will be changed to `999:999` on **every** update.
-> But will only be changed once for the `odoo` and `postgres` data directories.
+> But will only be changed once for the `postgres` data directories.

community/odoo/1.0.4/app-readme.md → community/odoo/1.1.0/app-readme.md

@@ -3,10 +3,9 @@
 [Odoo](https://odoo.com) is a suite of web based open source business apps.
 
 > When application is installed, a container will be launched with **root** privileges.
-> This is required in order to apply the correct permissions to the `odoo` directories.
-> Afterward, the `odoo` container will run as a **non**-root user (`101`).
-> Same applies to the `postgres` container. This will run afterwards as a **non**-root user (`999`).
+> This is required in order to apply the correct permissions to the `postgres` directories.
+> Afterwards `postgres` will run afterwards as a **non**-root user (`999`).
 > On each upgrade, a container will be launched with **root** privileges in order to apply the correct
 > permissions to the `postgres` **backups** directory. Container that performs the backup will run as a **non**-root user (`999`) afterwards.
 > Keep in mind the permissions on the backup directory will be changed to `999:999` on **every** update.
-> But will only be changed once for the `odoo` and `postgres` data directories.
+> But will only be changed once for the `postgres` data directories.

community/odoo/1.1.0/ci/basic-values.yaml

@@ -0,0 +1,12 @@
+odooNetwork:
+  webPort: 31000
+
+odooStorage:
+  data:
+    type: pvc
+  addons:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir

community/odoo/1.1.0/ci/extra-values.yaml

@@ -0,0 +1,19 @@
+odooNetwork:
+  webPort: 31000
+
+odooConfig:
+  additionalConf:
+    - key: workers
+      value: "0"
+    - key: log_level
+      value: "info"
+
+odooStorage:
+  data:
+    type: pvc
+  addons:
+    type: pvc
+  pgData:
+    type: pvc
+  pgBackup:
+    type: emptyDir

community/odoo/1.0.4/ix_values.yaml → community/odoo/1.1.0/ix_values.yaml

@@ -19,16 +19,21 @@ odooNetwork:
 odooStorage:
   data:
     type: ixVolume
-    datasetName: data
+    ixVolumeConfig:
+      datasetName: data
   addons:
     type: ixVolume
-    datasetName: addons
+    ixVolumeConfig:
+      datasetName: addons
   pgData:
     type: ixVolume
-    datasetName: pgData
+    ixVolumeConfig:
+      datasetName: pgData
   pgBackup:
     type: ixVolume
-    datasetName: pgBackup
+    ixVolumeConfig:
+      datasetName: pgBackup
+  additionalStorages: []
 
 notes:
   custom: |

community/odoo/1.1.0/migrations/migrate

@@ -0,0 +1,51 @@
+#!/usr/bin/python3
+import json
+import os
+import sys
+
+
+def storage_migrate(storage):
+    delete_keys = []
+    if storage['type'] == 'hostPath':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('hostPath'):
+            return storage
+
+        storage['hostPathConfig'] = {'hostPath': storage['hostPath']}
+        delete_keys.append('hostPath')
+
+    elif storage['type'] == 'ixVolume':
+        # Check if the key exists, if not we have already migrated
+        if not storage.get('datasetName'):
+            return storage
+
+        storage['ixVolumeConfig'] = {'datasetName': storage['datasetName']}
+        delete_keys.append('datasetName')
+
+    for key in delete_keys:
+        storage.pop(key, None)
+
+    return storage
+
+
+def migrate(values):
+    storage_key = 'odooStorage'
+    storages = ['data', 'addons', 'pgData', 'pgBackup']
+
+    for storage in storages:
+        check_val = values.get(storage_key, {}).get(storage, {})
+        if not isinstance(check_val, dict) or not check_val:
+            raise Exception(f'Storage section {storage} is malformed')
+
+        values[storage_key][storage] = storage_migrate(check_val)
+
+    return values
+
+
+if __name__ == '__main__':
+    if len(sys.argv) != 2:
+        exit(1)
+
+    if os.path.exists(sys.argv[1]):
+        with open(sys.argv[1], 'r') as f:
+            print(json.dumps(migrate(json.loads(f.read()))))

community/odoo/1.1.0/questions.yaml

@@ -0,0 +1,626 @@
+groups:
+  - name: Odoo Configuration
+    description: Configure Odoo
+  - name: Network Configuration
+    description: Configure Network for Odoo
+  - name: Storage Configuration
+    description: Configure Storage for Odoo
+  - name: Resources Configuration
+    description: Configure Resources for Odoo
+
+portals:
+  web_portal:
+    protocols:
+      - "$kubernetes-resource_configmap_portal_protocol"
+    host:
+      - "$kubernetes-resource_configmap_portal_host"
+    ports:
+      - "$kubernetes-resource_configmap_portal_port"
+    path: "$kubernetes-resource_configmap_portal_path"
+
+questions:
+
+  - variable: odooConfig
+    label: ""
+    group: Odoo Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: additionalConf
+          label: Additional File Configuration Options
+          description: |
+            Configure additional file configuration options for Odoo.</br>
+            Options are appended to the end of the configuration file.</br>
+            After the predefined configuration options.</br>
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: conf
+                label: Configuration Option
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: key
+                      label: Key
+                      schema:
+                        type: string
+                        required: true
+                    - variable: value
+                      label: Value
+                      schema:
+                        type: string
+                        required: true
+        - variable: additionalEnvs
+          label: Additional Environment Variables
+          description: Configure additional environment variables for Odoo.
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: env
+                label: Environment Variable
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: name
+                      label: Name
+                      schema:
+                        type: string
+                        required: true
+                    - variable: value
+                      label: Value
+                      schema:
+                        type: string
+                        required: true
+
+  - variable: odooNetwork
+    label: ""
+    group: Network Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: webPort
+          label: Web Port
+          description: The port for the Odoo WebUI.
+          schema:
+            type: int
+            default: 30062
+            min: 9000
+            max: 65535
+            required: true
+        - variable: hostNetwork
+          label: Host Network
+          description: |
+            Bind to the host network. It's recommended to keep this disabled.
+          schema:
+            type: boolean
+            default: false
+
+  - variable: odooStorage
+    label: ""
+    group: Storage Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: data
+          label: Odoo Data Storage
+          description: The path to store Odoo data.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: ixVolume
+                  enum:
+                    - value: hostPath
+                      description: Host Path (Path that already exists on the system)
+                    - value: ixVolume
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "ixVolume"]]
+                  $ref:
+                    - "normalize/ixVolume"
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "data"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "hostPath"]]
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
+        - variable: addons
+          label: Odoo Addons Storage
+          description: The path to store Odoo addons storage.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: ixVolume
+                  enum:
+                    - value: hostPath
+                      description: Host Path (Path that already exists on the system)
+                    - value: ixVolume
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "ixVolume"]]
+                  $ref:
+                    - "normalize/ixVolume"
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "addons"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "hostPath"]]
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
+        - variable: pgData
+          label: Odoo Postgres Data Storage
+          description: The path to store Odoo Postgres Data.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: ixVolume
+                  enum:
+                    - value: hostPath
+                      description: Host Path (Path that already exists on the system)
+                    - value: ixVolume
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
+                schema:
+                  type: dict
+                  # Nothing to show for the user
+                  hidden: true
+                  show_if: [["type", "=", "ixVolume"]]
+                  $ref:
+                    - "normalize/ixVolume"
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "pgData"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "hostPath"]]
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
+        - variable: pgBackup
+          label: Odoo Postgres Backup Storage
+          description: The path to store Odoo Postgres Backup.
+          schema:
+            type: dict
+            attrs:
+              - variable: type
+                label: Type
+                description: |
+                  ixVolume: Is dataset created automatically by the system.</br>
+                  Host Path: Is a path that already exists on the system.
+                schema:
+                  type: string
+                  required: true
+                  immutable: true
+                  default: ixVolume
+                  enum:
+                    - value: hostPath
+                      description: Host Path (Path that already exists on the system)
+                    - value: ixVolume
+                      description: ixVolume (Dataset created automatically by the system)
+              - variable: ixVolumeConfig
+                label: ixVolume Configuration
+                description: The configuration for the ixVolume dataset.
+                schema:
+                  type: dict
+                  # Nothing to show for the user
+                  hidden: true
+                  show_if: [["type", "=", "ixVolume"]]
+                  $ref:
+                    - "normalize/ixVolume"
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: datasetName
+                      label: Dataset Name
+                      description: The name of the dataset to use for storage.
+                      schema:
+                        type: string
+                        required: true
+                        immutable: true
+                        hidden: true
+                        default: "pgBackup"
+                    - variable: aclEntries
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+              - variable: hostPathConfig
+                label: hostPathConfig
+                schema:
+                  type: dict
+                  show_if: [["type", "=", "hostPath"]]
+                  attrs:
+                    - variable: aclEnable
+                      label: Enable ACL
+                      description: Enable ACL for the dataset.
+                      schema:
+                        type: boolean
+                        # Postgres does a CHMOD at startup
+                        # Which fails with ACL
+                        hidden: true
+                        default: false
+                    - variable: acl
+                      label: ACL Configuration
+                      schema:
+                        type: dict
+                        show_if: [["aclEnable", "=", true]]
+                        attrs: []
+                        $ref:
+                          - "normalize/acl"
+                    - variable: hostPath
+                      label: Host Path
+                      description: The host path to use for storage.
+                      schema:
+                        type: hostpath
+                        show_if: [["aclEnable", "=", false]]
+                        immutable: true
+                        required: true
+
+        - variable: additionalStorages
+          label: Additional Storage
+          description: Additional storage for Odoo.
+          schema:
+            type: list
+            default: []
+            items:
+              - variable: storageEntry
+                label: Storage Entry
+                schema:
+                  type: dict
+                  attrs:
+                    - variable: type
+                      label: Type
+                      description: |
+                        ixVolume: Is dataset created automatically by the system.</br>
+                        Host Path: Is a path that already exists on the system.</br>
+                        SMB Share: Is a SMB share that is mounted to a persistent volume claim.
+                      schema:
+                        type: string
+                        required: true
+                        default: "ixVolume"
+                        immutable: true
+                        enum:
+                          - value: "hostPath"
+                            description: Host Path (Path that already exists on the system)
+                          - value: "ixVolume"
+                            description: ixVolume (Dataset created automatically by the system)
+                          - value: "smb-pv-pvc"
+                            description: SMB Share (Mounts a persistent volume claim to a SMB share)
+                    - variable: readOnly
+                      label: Read Only
+                      description: Mount the volume as read only.
+                      schema:
+                        type: boolean
+                        default: false
+                    - variable: mountPath
+                      label: Mount Path
+                      description: The path inside the container to mount the storage.
+                      schema:
+                        type: path
+                        required: true
+                    - variable: hostPathConfig
+                      label: hostPathConfig
+                      schema:
+                        type: dict
+                        show_if: [["type", "=", "hostPath"]]
+                        attrs:
+                          - variable: aclEnable
+                            label: Enable ACL
+                            description: Enable ACL for the dataset.
+                            schema:
+                              type: boolean
+                              default: false
+                          - variable: acl
+                            label: ACL Configuration
+                            schema:
+                              type: dict
+                              show_if: [["aclEnable", "=", true]]
+                              attrs: []
+                              $ref:
+                                - "normalize/acl"
+                          - variable: hostPath
+                            label: Host Path
+                            description: The host path to use for storage.
+                            schema:
+                              type: hostpath
+                              show_if: [["aclEnable", "=", false]]
+                              immutable: true
+                              required: true
+                    - variable: ixVolumeConfig
+                      label: ixVolume Configuration
+                      description: The configuration for the ixVolume dataset.
+                      schema:
+                        type: dict
+                        show_if: [["type", "=", "ixVolume"]]
+                        $ref:
+                          - "normalize/ixVolume"
+                        attrs:
+                          - variable: aclEnable
+                            label: Enable ACL
+                            description: Enable ACL for the dataset.
+                            schema:
+                              type: boolean
+                              default: false
+                          - variable: datasetName
+                            label: Dataset Name
+                            description: The name of the dataset to use for storage.
+                            schema:
+                              type: string
+                              required: true
+                              immutable: true
+                              default: "storage_entry"
+                          - variable: aclEntries
+                            label: ACL Configuration
+                            schema:
+                              type: dict
+                              show_if: [["aclEnable", "=", true]]
+                              attrs: []
+                    - variable: smbConfig
+                      label: SMB Share Configuration
+                      description: The configuration for the SMB Share.
+                      schema:
+                        type: dict
+                        show_if: [["type", "=", "smb-pv-pvc"]]
+                        attrs:
+                          - variable: server
+                            label: Server
+                            description: The server for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: share
+                            label: Share
+                            description: The share name for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: domain
+                            label: Domain (Optional)
+                            description: The domain for the SMB share.
+                            schema:
+                              type: string
+                          - variable: username
+                            label: Username
+                            description: The username for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                          - variable: password
+                            label: Password
+                            description: The password for the SMB share.
+                            schema:
+                              type: string
+                              required: true
+                              private: true
+                          - variable: size
+                            label: Size (in Gi)
+                            description: The size of the volume quota.
+                            schema:
+                              type: int
+                              required: true
+                              min: 1
+                              default: 1
+
+  - variable: resources
+    label: ""
+    group: Resources Configuration
+    schema:
+      type: dict
+      attrs:
+        - variable: limits
+          label: Limits
+          schema:
+            type: dict
+            attrs:
+              - variable: cpu
+                label: CPU
+                description: CPU limit for Odoo.
+                schema:
+                  type: string
+                  max_length: 6
+                  valid_chars: '^(0\.[1-9]|[1-9][0-9]*)(\.[0-9]|m?)$'
+                  valid_chars_error: |
+                    Valid CPU limit formats are</br>
+                    - Plain Integer - eg. 1</br>
+                    - Float - eg. 0.5</br>
+                    - Milicpu - eg. 500m
+                  default: "4000m"
+                  required: true
+              - variable: memory
+                label: Memory
+                description: Memory limit for Odoo.
+                schema:
+                  type: string
+                  max_length: 12
+                  valid_chars: '^[1-9][0-9]*([EPTGMK]i?|e[0-9]+)?$'
+                  valid_chars_error: |
+                    Valid Memory limit formats are</br>
+                    - Suffixed with E/P/T/G/M/K - eg. 1G</br>
+                    - Suffixed with Ei/Pi/Ti/Gi/Mi/Ki - eg. 1Gi</br>
+                    - Plain Integer in bytes - eg. 1024</br>
+                    - Exponent - eg. 134e6
+                  default: "8Gi"
+                  required: true

community/odoo/1.0.4/templates/_odoo.tpl → community/odoo/1.1.0/templates/_odoo.tpl

@@ -40,14 +40,10 @@ workload:
               path: /web/health
               port: {{ .Values.odooNetwork.webPort }}
       initContainers:
-      {{- include "ix.v1.common.app.permissions" (dict "containerName" "01-permissions"
-                                                        "UID" 101
-                                                        "GID" 101
-                                                        "type" "install") | nindent 8 }}
-      {{- include "ix.v1.common.app.postgresWait" (dict "name" "02-postgres-wait"
+      {{- include "ix.v1.common.app.postgresWait" (dict "name" "01-postgres-wait"
                                                         "secretName" "postgres-creds") | nindent 8 }}
         {{- if .Release.IsInstall }} {{/* If we use type: install it will run before the postgres wait and fail */}}
-        03-db-init:
+        02-db-init:
           enabled: true
           type: init
           imageSelector: image

community/odoo/1.1.0/templates/_persistence.tpl

@@ -0,0 +1,75 @@
+{{- define "odoo.persistence" -}}
+persistence:
+  data:
+    enabled: true
+    {{- include "odoo.storage.ci.migration" (dict "storage" .Values.odooStorage.data) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.odooStorage.data) | nindent 4 }}
+    targetSelector:
+      odoo:
+        odoo:
+          mountPath: /var/lib/odoo
+        02-db-init:
+          mountPath: /var/lib/odoo
+  addons:
+    enabled: true
+    {{- include "odoo.storage.ci.migration" (dict "storage" .Values.odooStorage.addons) }}
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" .Values.odooStorage.addons) | nindent 4 }}
+    targetSelector:
+      odoo:
+        odoo:
+          mountPath: /mnt/extra-addons
+        02-db-init:
+          mountPath: /mnt/extra-addons
+  tmp:
+    enabled: true
+    type: emptyDir
+    targetSelector:
+      odoo:
+        odoo:
+          mountPath: /tmp
+        02-db-init:
+          mountPath: /tmp
+
+  config:
+    enabled: true
+    type: secret
+    objectName: odoo-config
+    targetSelector:
+      odoo:
+        odoo:
+          mountPath: /etc/odoo/odoo.conf
+          readOnly: true
+          subPath: odoo.conf
+        02-db-init:
+          mountPath: /etc/odoo/odoo.conf
+          readOnly: true
+          subPath: odoo.conf
+
+  {{- range $idx, $storage := .Values.odooStorage.additionalStorages }}
+  {{ printf "odoo-%v:" (int $idx) }}
+    enabled: true
+    {{- include "ix.v1.common.app.storageOptions" (dict "storage" $storage) | nindent 4 }}
+    targetSelector:
+      odoo:
+        odoo:
+          mountPath: {{ $storage.mountPath }}
+  {{- end }}
+
+  {{- include "odoo.storage.ci.migration" (dict "storage" .Values.odooStorage.pgData) }}
+  {{- include "odoo.storage.ci.migration" (dict "storage" .Values.odooStorage.pgBackup) }}
+  {{- include "ix.v1.common.app.postgresPersistence"
+      (dict "pgData" .Values.odooStorage.pgData
+            "pgBackup" .Values.odooStorage.pgBackup
+      ) | nindent 2 }}
+{{- end -}}
+
+
+{{/* TODO: Remove on the next version bump, eg 1.1.0+ */}}
+{{- define "odoo.storage.ci.migration" -}}
+  {{- $storage := .storage -}}
+
+  {{- if $storage.hostPath -}}
+    {{- $_ := set $storage "hostPathConfig" dict -}}
+    {{- $_ := set $storage.hostPathConfig "hostPath" $storage.hostPath -}}
+  {{- end -}}
+{{- end -}}