diff --git a/CHANGELOG.md b/CHANGELOG.md new file mode 100644 index 0000000000000000000000000000000000000000..197018da8184bd5751e140830c3d680c6c318dd2 --- /dev/null +++ b/CHANGELOG.md @@ -0,0 +1,9 @@ +# Changelog + +The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). + +--- +## [odoo-enterprise-16.0] - 2023-11-13 +### Updated +- Added branch to fix HPA API version and update Odoo to use enterprise image + diff --git a/chart/Chart.yaml b/chart/Chart.yaml index 6132b1f8667db4329bb7acffa7438326dcb8159c..f0314ec84fd0aa0b4eb27270c9d47ccb62febeab 100644 --- a/chart/Chart.yaml +++ b/chart/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 annotations: category: CRM apiVersion: v2 -appVersion: 14.0.20210810 +appVersion: 16.0.20221020 description: A suite of web based open source business apps. keywords: - odoo @@ -12,15 +12,15 @@ keywords: - web icon: https://odoocdn.com/openerp_website/static/src/img/assets/png/odoo_logo.png maintainers: -- email: asanna@vivsoft.io +- email: matthew.gunter@parsons.com name: PlatformOne name: odoo sources: - https://www.odoo.com/ - https://repo1.dso.mil/dsop/opensource/odoo/odoo -version: 0.2.0 +version: 0.4.2 dependencies: - name: postgresql version: 8.6.4 repository: file://./deps/postgresql - condition: postgresql.enabled \ No newline at end of file + condition: postgresql.enabled diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml index 6ad0309baf3958d61183bc0b95af39f0d1837d0c..1cfa98a099174c5d96f63b1e728741ddf49ab85d 100644 --- a/chart/templates/deployment.yaml +++ b/chart/templates/deployment.yaml @@ -147,8 +147,14 @@ spec: volumeMounts: - name: odoo-data mountPath: /var/lib/odoo + - name: odoo-database-manager + mountPath: /etc/odoo + readOnly: true volumes: - name: odoo-data persistentVolumeClaim: claimName: {{ template "odoo.fullname" . }}-data + - name: odoo-database-manager + secret: + secretName: {{ template "odoo.fullname" . }}-database-manager diff --git a/chart/templates/hpa.yaml b/chart/templates/hpa.yaml deleted file mode 100644 index 411dce0454ee4d9853bb9d46ce43aa3a51d6801c..0000000000000000000000000000000000000000 --- a/chart/templates/hpa.yaml +++ /dev/null @@ -1,33 +0,0 @@ -{{- if .Values.autoscaling.enabled }} -apiVersion: autoscaling/v2beta1 -kind: HorizontalPodAutoscaler -metadata: - name: {{ template "odoo.fullname" . }} - namespace: {{ .Release.Namespace | quote }} - labels: - app.kubernetes.io/name: {{ include "odoo.name" . }} - helm.sh/chart: {{ include "odoo.chart" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - app.kubernetes.io/managed-by: {{ .Release.Service }} - -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: {{ template "odoo.fullname" . }} - minReplicas: {{ .Values.autoscaling.minReplicas }} - maxReplicas: {{ .Values.autoscaling.maxReplicas }} - metrics: - {{- if .Values.autoscaling.targetCPU }} - - type: Resource - resource: - name: cpu - targetAverageUtilization: {{ .Values.autoscaling.targetCPU }} - {{- end }} - {{- if .Values.autoscaling.targetMemory }} - - type: Resource - resource: - name: memory - targetAverageUtilization: {{ .Values.autoscaling.targetMemory }} - {{- end }} -{{- end }} diff --git a/chart/values.yaml b/chart/values.yaml index cf1ec5124fc89fc130a9561347cd58e807992fb5..b2760280b91fe56e0af70deac309359c7e4e5e63 100644 --- a/chart/values.yaml +++ b/chart/values.yaml @@ -10,8 +10,8 @@ podAntiAffinityPreset: soft extraLabels : {} image: - repository: registry1.dso.mil/ironbank/opensource/odoo/odoo - tag: '14.0' + repository: registry1.dso.mil/ironbank/opensource/odoo/odoo-enterprise + tag: '16.0' imagePullPolicy: IfNotPresent imagePullSecret: private-registry debug: false @@ -174,4 +174,4 @@ postgresql: serviceAccount: enabled: false networkPolicies: - enabled: false \ No newline at end of file + enabled: false