diff --git a/library/ix-dev/community/odoo/Chart.lock b/library/ix-dev/community/odoo/Chart.lock index eb07e513da..832623e87d 100644 --- a/library/ix-dev/community/odoo/Chart.lock +++ b/library/ix-dev/community/odoo/Chart.lock @@ -1,6 +1,6 @@ dependencies: - name: common repository: file://../../../common - version: 1.1.1 -digest: sha256:a7dbe3e4d42dbcd4325776e5e01a1d630c7f185f79e7ebf22b1b9cc80f56eed7 -generated: "2023-10-17T17:57:09.95481132+03:00" + version: 1.2.1 +digest: sha256:d695592ea5213fe64453171205ca326015d02df3888a7858becc0c733b0de4c7 +generated: "2023-11-06T19:52:22.015444086+02:00" diff --git a/library/ix-dev/community/odoo/Chart.yaml b/library/ix-dev/community/odoo/Chart.yaml index 520d723fab..c7b8a5e3e9 100644 --- a/library/ix-dev/community/odoo/Chart.yaml +++ b/library/ix-dev/community/odoo/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.2 +version: 1.0.3 apiVersion: v2 appVersion: '16.0' kubeVersion: '>=1.16.0-0' @@ -14,7 +14,7 @@ maintainers: dependencies: - name: common repository: file://../../../common - version: 1.1.1 + version: 1.2.1 home: https://www.odoo.com/ icon: https://media.sys.truenas.net/apps/odoo/icons/icon.png sources: diff --git a/library/ix-dev/community/odoo/charts/common-1.1.1.tgz b/library/ix-dev/community/odoo/charts/common-1.1.1.tgz deleted file mode 100644 index 33cef4b4f7..0000000000 Binary files a/library/ix-dev/community/odoo/charts/common-1.1.1.tgz and /dev/null differ diff --git a/library/ix-dev/community/odoo/charts/common-1.2.1.tgz b/library/ix-dev/community/odoo/charts/common-1.2.1.tgz new file mode 100644 index 0000000000..54dcf1d1f3 Binary files /dev/null and b/library/ix-dev/community/odoo/charts/common-1.2.1.tgz differ diff --git a/library/ix-dev/community/odoo/templates/_persistence.tpl b/library/ix-dev/community/odoo/templates/_persistence.tpl index af3244ac58..eeea0e552e 100644 --- a/library/ix-dev/community/odoo/templates/_persistence.tpl +++ b/library/ix-dev/community/odoo/templates/_persistence.tpl @@ -50,33 +50,9 @@ persistence: mountPath: /etc/odoo/odoo.conf readOnly: true subPath: odoo.conf - # Postgres - postgresdata: - enabled: true - type: {{ .Values.odooStorage.pgData.type }} - datasetName: {{ .Values.odooStorage.pgData.datasetName | default "" }} - hostPath: {{ .Values.odooStorage.pgData.hostPath | default "" }} - targetSelector: - # Postgres pod - postgres: - # Postgres container - postgres: - mountPath: /var/lib/postgresql/data - # Permissions container - permissions: - mountPath: /mnt/directories/postgres_data - postgresbackup: - enabled: true - type: {{ .Values.odooStorage.pgBackup.type }} - datasetName: {{ .Values.odooStorage.pgBackup.datasetName | default "" }} - hostPath: {{ .Values.odooStorage.pgBackup.hostPath | default "" }} - targetSelector: - # Postgres backup pod - postgresbackup: - # Postgres backup container - postgresbackup: - mountPath: /postgres_backup - # Permissions container - permissions: - mountPath: /mnt/directories/postgres_backup + + {{- include "ix.v1.common.app.postgresPersistence" + (dict "pgData" .Values.odooStorage.pgData + "pgBackup" .Values.odooStorage.pgBackup + ) | nindent 2 }} {{- end -}} diff --git a/library/ix-dev/community/odoo/templates/_service.tpl b/library/ix-dev/community/odoo/templates/_service.tpl index 9705c15405..fb68cae112 100644 --- a/library/ix-dev/community/odoo/templates/_service.tpl +++ b/library/ix-dev/community/odoo/templates/_service.tpl @@ -12,15 +12,6 @@ service: port: {{ .Values.odooNetwork.webPort }} nodePort: {{ .Values.odooNetwork.webPort }} targetSelector: odoo - # Postgres - postgres: - enabled: true - type: ClusterIP - targetSelector: postgres - ports: - postgres: - enabled: true - primary: true - port: 5432 - targetSelector: postgres + {{- include "ix.v1.common.app.postgresService" $ | nindent 2 }} + {{- end -}}