From 7f83400f2b6dedba0579d23017e2e24ec2cd2cfe Mon Sep 17 00:00:00 2001
From: Matthew Gunter <matthew.gunter@parsons.com>
Date: Wed, 19 Oct 2022 14:04:03 -0600
Subject: [PATCH 1/5] Update Odoo to 16.0
---
chart/Chart.yaml | 6 +++---
chart/values.yaml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 6132b1f..d5f33bd 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,13 +12,13 @@ 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.0
dependencies:
- name: postgresql
version: 8.6.4
diff --git a/chart/values.yaml b/chart/values.yaml
index cf1ec51..aae93ef 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -11,7 +11,7 @@ extraLabels : {}
image:
repository: registry1.dso.mil/ironbank/opensource/odoo/odoo
- tag: '14.0'
+ tag: '16.0'
imagePullPolicy: IfNotPresent
imagePullSecret: private-registry
debug: false
--
GitLab
From d2e3457185cc14db4653a4063ce2e0988dc961bc Mon Sep 17 00:00:00 2001
From: Matthew Gunter <matthew.gunter@parsons.com>
Date: Thu, 9 Mar 2023 15:53:07 -0600
Subject: [PATCH 2/5] Mount database manager password file to deployment
---
chart/templates/deployment.yaml | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/chart/templates/deployment.yaml b/chart/templates/deployment.yaml
index 6ad0309..1cfa98a 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
--
GitLab
From cebabbe6e918221737fa202ff7abf2b310406e55 Mon Sep 17 00:00:00 2001
From: Matthew Gunter <matthew.gunter@parsons.com>
Date: Thu, 9 Mar 2023 16:04:42 -0600
Subject: [PATCH 3/5] Bump chart version
---
chart/Chart.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index d5f33bd..9da9582 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -18,7 +18,7 @@ name: odoo
sources:
- https://www.odoo.com/
- https://repo1.dso.mil/dsop/opensource/odoo/odoo
-version: 0.4.0
+version: 0.4.1
dependencies:
- name: postgresql
version: 8.6.4
--
GitLab
From 59d777a1f28f492889e9ca14b60cffae4213b9f2 Mon Sep 17 00:00:00 2001
From: Matthew Gunter <matthew.gunter@parsons.com>
Date: Mon, 4 Dec 2023 21:43:22 +0000
Subject: [PATCH 4/5] Update Odoo image to use enterprise version and fix HPA
API version
---
CHANGELOG.md | 9 +++++++++
chart/templates/hpa.yaml | 33 ---------------------------------
chart/values.yaml | 4 ++--
3 files changed, 11 insertions(+), 35 deletions(-)
create mode 100644 CHANGELOG.md
delete mode 100644 chart/templates/hpa.yaml
diff --git a/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 0000000..197018d
--- /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/templates/hpa.yaml b/chart/templates/hpa.yaml
deleted file mode 100644
index 411dce0..0000000
--- 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 aae93ef..b276028 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -10,7 +10,7 @@ podAntiAffinityPreset: soft
extraLabels : {}
image:
- repository: registry1.dso.mil/ironbank/opensource/odoo/odoo
+ repository: registry1.dso.mil/ironbank/opensource/odoo/odoo-enterprise
tag: '16.0'
imagePullPolicy: IfNotPresent
imagePullSecret: private-registry
@@ -174,4 +174,4 @@ postgresql:
serviceAccount:
enabled: false
networkPolicies:
- enabled: false
\ No newline at end of file
+ enabled: false
--
GitLab
From 938f1968b33c5ed6eee0b2fe8df966506f060d8f Mon Sep 17 00:00:00 2001
From: Matthew Gunter <matthew.gunter@parsons.com>
Date: Mon, 4 Dec 2023 21:54:54 +0000
Subject: [PATCH 5/5] Odoo enterprise 16.0
---
chart/Chart.yaml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 9da9582..f0314ec 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -18,9 +18,9 @@ name: odoo
sources:
- https://www.odoo.com/
- https://repo1.dso.mil/dsop/opensource/odoo/odoo
-version: 0.4.1
+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
--
GitLab