diff --git a/stable/odoo/Chart.yaml b/stable/odoo/Chart.yaml index 56be3cd836c5..ec1774c91705 100644 --- a/stable/odoo/Chart.yaml +++ b/stable/odoo/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: odoo -version: 11.1.11 +version: 12.0.0 appVersion: 12.0.20191015 description: A suite of web based open source business apps. home: https://www.odoo.com/ diff --git a/stable/odoo/README.md b/stable/odoo/README.md index b4129ca9e212..ad18f1d02407 100644 --- a/stable/odoo/README.md +++ b/stable/odoo/README.md @@ -166,6 +166,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### To 12.0.0 + +Helm performs a lookup for the object based on its group (apps), version (v1), and kind (Deployment). Also known as its GroupVersionKind, or GVK. Changing the GVK is considered a compatibility breaker from Kubernetes' point of view, so you cannot "upgrade" those objects to the new GVK in-place. Earlier versions of Helm 3 did not perform the lookup correctly which has since been fixed to match the spec. + +In https://github.com/helm/charts/pull/17352 the `apiVersion` of the deployment resources was updated to `apps/v1` in tune with the api's deprecated, resulting in compatibility breakage. + +This major version signifies this change. + ### To 3.0.0 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments. diff --git a/stable/odoo/requirements.lock b/stable/odoo/requirements.lock index 7e22c4647a6d..da2f67e9c1e8 100644 --- a/stable/odoo/requirements.lock +++ b/stable/odoo/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.5.4 -digest: sha256:3fb60c16194499f6ebb30080e98e402f6c6d0fcf1133b8b03c2a90224b3fc291 -generated: 2019-10-29T18:16:22.284254529Z + version: 7.0.0 +digest: sha256:e7c3fc1c0606c69cfd4240a86f1ada88086f7b37b51d16a4ce56cf48314065e3 +generated: "2019-11-09T11:07:10.545595711+05:30" diff --git a/stable/odoo/requirements.yaml b/stable/odoo/requirements.yaml index c47db878c781..4ead27b1473b 100644 --- a/stable/odoo/requirements.yaml +++ b/stable/odoo/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: postgresql condition: postgresql.enabled - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ diff --git a/stable/odoo/templates/_helpers.tpl b/stable/odoo/templates/_helpers.tpl index e35719a320be..8e65eafc6680 100644 --- a/stable/odoo/templates/_helpers.tpl +++ b/stable/odoo/templates/_helpers.tpl @@ -124,3 +124,14 @@ but Helm 2.9 and 2.10 does not support it, so we need to implement this if-else {{- end -}} {{- end -}} {{- end -}} + +{{/* +Return the appropriate apiVersion for deployment. +*/}} +{{- define "odoo.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/stable/odoo/templates/deployment.yaml b/stable/odoo/templates/deployment.yaml index cd2f63036c5f..ab1346c8ae09 100644 --- a/stable/odoo/templates/deployment.yaml +++ b/stable/odoo/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1 +apiVersion: {{ template "odoo.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "odoo.fullname" . }}