From 73669f9b6c9214b32ffe0a39e1231ade7ddbb68d Mon Sep 17 00:00:00 2001 From: bitnami-bot Date: Tue, 12 Nov 2019 09:35:05 +0000 Subject: [PATCH] Synchronize upstreamed folder to 36752205e --- upstreamed/drupal/Chart.yaml | 2 +- upstreamed/drupal/README.md | 8 ++++++++ upstreamed/drupal/requirements.lock | 6 +++--- upstreamed/drupal/requirements.yaml | 2 +- upstreamed/drupal/templates/_helpers.tpl | 11 +++++++++++ upstreamed/drupal/templates/deployment.yaml | 2 +- upstreamed/odoo/Chart.yaml | 2 +- upstreamed/odoo/README.md | 8 ++++++++ upstreamed/odoo/requirements.lock | 6 +++--- upstreamed/odoo/requirements.yaml | 2 +- upstreamed/odoo/templates/_helpers.tpl | 11 +++++++++++ upstreamed/odoo/templates/deployment.yaml | 2 +- upstreamed/osclass/Chart.yaml | 2 +- upstreamed/osclass/README.md | 8 ++++++++ upstreamed/osclass/requirements.lock | 6 +++--- upstreamed/osclass/requirements.yaml | 2 +- upstreamed/osclass/templates/_helpers.tpl | 11 +++++++++++ upstreamed/osclass/templates/deployment.yaml | 2 +- upstreamed/owncloud/Chart.yaml | 2 +- upstreamed/owncloud/README.md | 8 ++++++++ upstreamed/owncloud/requirements.lock | 6 +++--- upstreamed/owncloud/requirements.yaml | 2 +- upstreamed/owncloud/templates/_helpers.tpl | 11 +++++++++++ upstreamed/owncloud/templates/deployment.yaml | 2 +- upstreamed/phpbb/Chart.yaml | 2 +- upstreamed/phpbb/README.md | 8 ++++++++ upstreamed/phpbb/requirements.lock | 6 +++--- upstreamed/phpbb/requirements.yaml | 2 +- upstreamed/phpbb/templates/_helpers.tpl | 11 +++++++++++ upstreamed/phpbb/templates/deployment.yaml | 2 +- upstreamed/prestashop/Chart.yaml | 2 +- upstreamed/prestashop/README.md | 8 ++++++++ upstreamed/prestashop/requirements.lock | 6 +++--- upstreamed/prestashop/requirements.yaml | 2 +- upstreamed/prestashop/templates/_helpers.tpl | 11 +++++++++++ upstreamed/prestashop/templates/deployment.yaml | 2 +- upstreamed/redmine/Chart.yaml | 2 +- upstreamed/redmine/README.md | 8 ++++++++ upstreamed/redmine/requirements.lock | 8 ++++---- upstreamed/redmine/requirements.yaml | 4 ++-- upstreamed/redmine/templates/_helpers.tpl | 11 +++++++++++ upstreamed/redmine/templates/deployment.yaml | 2 +- upstreamed/suitecrm/Chart.yaml | 2 +- upstreamed/suitecrm/README.md | 8 ++++++++ upstreamed/suitecrm/requirements.lock | 6 +++--- upstreamed/suitecrm/requirements.yaml | 2 +- upstreamed/suitecrm/templates/_helpers.tpl | 11 +++++++++++ upstreamed/suitecrm/templates/deployment.yaml | 2 +- upstreamed/testlink/Chart.yaml | 2 +- upstreamed/testlink/README.md | 8 ++++++++ upstreamed/testlink/requirements.lock | 6 +++--- upstreamed/testlink/requirements.yaml | 2 +- upstreamed/testlink/templates/_helpers.tpl | 11 +++++++++++ upstreamed/testlink/templates/deployment.yaml | 2 +- 54 files changed, 227 insertions(+), 56 deletions(-) diff --git a/upstreamed/drupal/Chart.yaml b/upstreamed/drupal/Chart.yaml index c1f5b7a79f..4ae55fa4f6 100644 --- a/upstreamed/drupal/Chart.yaml +++ b/upstreamed/drupal/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: drupal -version: 5.2.9 +version: 6.0.0 appVersion: 8.7.8 description: One of the most versatile open source content management systems. keywords: diff --git a/upstreamed/drupal/README.md b/upstreamed/drupal/README.md index 3d02011533..68215bd28d 100644 --- a/upstreamed/drupal/README.md +++ b/upstreamed/drupal/README.md @@ -195,6 +195,14 @@ $ helm install --name my-release --set persistence.drupal.existingClaim=PVC_NAME ## Upgrading +### To 6.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/17295 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 2.0.0 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments. diff --git a/upstreamed/drupal/requirements.lock b/upstreamed/drupal/requirements.lock index c056396265..3359f694c3 100644 --- a/upstreamed/drupal/requirements.lock +++ b/upstreamed/drupal/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-29T07:26:54.90698574Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T09:50:12.572245686+05:30" diff --git a/upstreamed/drupal/requirements.yaml b/upstreamed/drupal/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/drupal/requirements.yaml +++ b/upstreamed/drupal/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/drupal/templates/_helpers.tpl b/upstreamed/drupal/templates/_helpers.tpl index 0710bd6c16..e19fc6dfcd 100644 --- a/upstreamed/drupal/templates/_helpers.tpl +++ b/upstreamed/drupal/templates/_helpers.tpl @@ -153,3 +153,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 "drupal.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/drupal/templates/deployment.yaml b/upstreamed/drupal/templates/deployment.yaml index e14537c857..273853d623 100644 --- a/upstreamed/drupal/templates/deployment.yaml +++ b/upstreamed/drupal/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1 +apiVersion: {{ template "drupal.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "drupal.fullname" . }} diff --git a/upstreamed/odoo/Chart.yaml b/upstreamed/odoo/Chart.yaml index 56be3cd836..ec1774c917 100644 --- a/upstreamed/odoo/Chart.yaml +++ b/upstreamed/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/upstreamed/odoo/README.md b/upstreamed/odoo/README.md index b4129ca9e2..ad18f1d024 100644 --- a/upstreamed/odoo/README.md +++ b/upstreamed/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/upstreamed/odoo/requirements.lock b/upstreamed/odoo/requirements.lock index 7e22c4647a..da2f67e9c1 100644 --- a/upstreamed/odoo/requirements.lock +++ b/upstreamed/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/upstreamed/odoo/requirements.yaml b/upstreamed/odoo/requirements.yaml index c47db878c7..4ead27b147 100644 --- a/upstreamed/odoo/requirements.yaml +++ b/upstreamed/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/upstreamed/odoo/templates/_helpers.tpl b/upstreamed/odoo/templates/_helpers.tpl index e35719a320..8e65eafc66 100644 --- a/upstreamed/odoo/templates/_helpers.tpl +++ b/upstreamed/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/upstreamed/odoo/templates/deployment.yaml b/upstreamed/odoo/templates/deployment.yaml index cd2f63036c..ab1346c8ae 100644 --- a/upstreamed/odoo/templates/deployment.yaml +++ b/upstreamed/odoo/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1 +apiVersion: {{ template "odoo.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "odoo.fullname" . }} diff --git a/upstreamed/osclass/Chart.yaml b/upstreamed/osclass/Chart.yaml index 39720f457e..40ff49ec46 100644 --- a/upstreamed/osclass/Chart.yaml +++ b/upstreamed/osclass/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: osclass -version: 6.2.7 +version: 7.0.0 appVersion: 3.7.4 description: Osclass is a php script that allows you to quickly create and manage your own free classifieds site. diff --git a/upstreamed/osclass/README.md b/upstreamed/osclass/README.md index 9ca7b691ae..d88ccd9298 100644 --- a/upstreamed/osclass/README.md +++ b/upstreamed/osclass/README.md @@ -168,6 +168,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### To 7.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/17303 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/upstreamed/osclass/requirements.lock b/upstreamed/osclass/requirements.lock index 7c8c5e337c..2a109bebd8 100644 --- a/upstreamed/osclass/requirements.lock +++ b/upstreamed/osclass/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-29T22:48:43.385675723Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:12:32.914247693+05:30" diff --git a/upstreamed/osclass/requirements.yaml b/upstreamed/osclass/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/osclass/requirements.yaml +++ b/upstreamed/osclass/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/osclass/templates/_helpers.tpl b/upstreamed/osclass/templates/_helpers.tpl index 2166c4434d..f3a887ebce 100644 --- a/upstreamed/osclass/templates/_helpers.tpl +++ b/upstreamed/osclass/templates/_helpers.tpl @@ -175,3 +175,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 "osclass.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/osclass/templates/deployment.yaml b/upstreamed/osclass/templates/deployment.yaml index 0988afdd63..5b182c3523 100644 --- a/upstreamed/osclass/templates/deployment.yaml +++ b/upstreamed/osclass/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if include "osclass.host" . -}} -apiVersion: apps/v1 +apiVersion: {{ template "osclass.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "osclass.fullname" . }} diff --git a/upstreamed/owncloud/Chart.yaml b/upstreamed/owncloud/Chart.yaml index b94b858f9e..e8c7e0cac7 100644 --- a/upstreamed/owncloud/Chart.yaml +++ b/upstreamed/owncloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: owncloud -version: 6.2.9 +version: 7.0.0 appVersion: 10.3.0 description: A file sharing server that puts the control and security of your own data back into your hands. keywords: diff --git a/upstreamed/owncloud/README.md b/upstreamed/owncloud/README.md index 98d6e6fab7..75d4a64f4e 100644 --- a/upstreamed/owncloud/README.md +++ b/upstreamed/owncloud/README.md @@ -159,6 +159,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### 7.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/17304 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/upstreamed/owncloud/requirements.lock b/upstreamed/owncloud/requirements.lock index 953211ad3f..664861ea89 100644 --- a/upstreamed/owncloud/requirements.lock +++ b/upstreamed/owncloud/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-29T14:10:06.538415037Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:14:44.633832382+05:30" diff --git a/upstreamed/owncloud/requirements.yaml b/upstreamed/owncloud/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/owncloud/requirements.yaml +++ b/upstreamed/owncloud/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/owncloud/templates/_helpers.tpl b/upstreamed/owncloud/templates/_helpers.tpl index 57126b6c36..7b9ef08c7d 100644 --- a/upstreamed/owncloud/templates/_helpers.tpl +++ b/upstreamed/owncloud/templates/_helpers.tpl @@ -175,3 +175,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 "owncloud.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/owncloud/templates/deployment.yaml b/upstreamed/owncloud/templates/deployment.yaml index 6c97397925..c162aad506 100644 --- a/upstreamed/owncloud/templates/deployment.yaml +++ b/upstreamed/owncloud/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if include "owncloud.host" . -}} -apiVersion: apps/v1 +apiVersion: {{ template "owncloud.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "owncloud.fullname" . }} diff --git a/upstreamed/phpbb/Chart.yaml b/upstreamed/phpbb/Chart.yaml index fb7a7f3477..753d66f9c9 100644 --- a/upstreamed/phpbb/Chart.yaml +++ b/upstreamed/phpbb/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: phpbb -version: 6.2.6 +version: 7.0.0 appVersion: 3.2.8 description: Community forum that supports the notion of users and groups, file attachments, full-text search, notifications and more. keywords: diff --git a/upstreamed/phpbb/README.md b/upstreamed/phpbb/README.md index 7cd1c32e62..a8f163fd21 100644 --- a/upstreamed/phpbb/README.md +++ b/upstreamed/phpbb/README.md @@ -148,6 +148,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### 7.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/17307 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/upstreamed/phpbb/requirements.lock b/upstreamed/phpbb/requirements.lock index 992b3fc79d..d4ab498706 100644 --- a/upstreamed/phpbb/requirements.lock +++ b/upstreamed/phpbb/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-24T17:29:58.399956213Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:23:46.242748477+05:30" diff --git a/upstreamed/phpbb/requirements.yaml b/upstreamed/phpbb/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/phpbb/requirements.yaml +++ b/upstreamed/phpbb/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/phpbb/templates/_helpers.tpl b/upstreamed/phpbb/templates/_helpers.tpl index ffbba2c345..713fe4e432 100644 --- a/upstreamed/phpbb/templates/_helpers.tpl +++ b/upstreamed/phpbb/templates/_helpers.tpl @@ -153,3 +153,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 "phpbb.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/phpbb/templates/deployment.yaml b/upstreamed/phpbb/templates/deployment.yaml index d8db9c4d8c..2aa5754062 100644 --- a/upstreamed/phpbb/templates/deployment.yaml +++ b/upstreamed/phpbb/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if or .Values.mariadb.enabled .Values.externalDatabase.host -}} -apiVersion: apps/v1 +apiVersion: {{ template "phpbb.deployment.apiVersion" . }} kind: Deployment metadata: name: "{{ template "phpbb.fullname" . }}" diff --git a/upstreamed/prestashop/Chart.yaml b/upstreamed/prestashop/Chart.yaml index f82fe7949d..041a1c01d9 100644 --- a/upstreamed/prestashop/Chart.yaml +++ b/upstreamed/prestashop/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: prestashop -version: 8.2.9 +version: 9.0.0 appVersion: 1.7.6-1 description: A popular open source ecommerce solution. Professional tools are easily accessible to increase online sales including instant guest checkout, abandoned cart reminders and automated Email marketing. keywords: diff --git a/upstreamed/prestashop/README.md b/upstreamed/prestashop/README.md index bee3944c5f..227369cabd 100644 --- a/upstreamed/prestashop/README.md +++ b/upstreamed/prestashop/README.md @@ -187,6 +187,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### To 9.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/17308 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/upstreamed/prestashop/requirements.lock b/upstreamed/prestashop/requirements.lock index 258e717e23..e83ce1cf84 100644 --- a/upstreamed/prestashop/requirements.lock +++ b/upstreamed/prestashop/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-30T13:11:16.767263723Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:26:13.384983037+05:30" diff --git a/upstreamed/prestashop/requirements.yaml b/upstreamed/prestashop/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/prestashop/requirements.yaml +++ b/upstreamed/prestashop/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/prestashop/templates/_helpers.tpl b/upstreamed/prestashop/templates/_helpers.tpl index f8d2b397f2..36bfd14f18 100644 --- a/upstreamed/prestashop/templates/_helpers.tpl +++ b/upstreamed/prestashop/templates/_helpers.tpl @@ -180,3 +180,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 "prestashop.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/prestashop/templates/deployment.yaml b/upstreamed/prestashop/templates/deployment.yaml index 1dc3aff1d4..717643fafe 100644 --- a/upstreamed/prestashop/templates/deployment.yaml +++ b/upstreamed/prestashop/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if include "prestashop.host" . -}} -apiVersion: apps/v1 +apiVersion: {{ template "prestashop.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "prestashop.fullname" . }} diff --git a/upstreamed/redmine/Chart.yaml b/upstreamed/redmine/Chart.yaml index 1b9514000b..be8a5ed9af 100644 --- a/upstreamed/redmine/Chart.yaml +++ b/upstreamed/redmine/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: redmine -version: 12.2.12 +version: 13.0.0 appVersion: 4.0.5 description: A flexible project management web application. keywords: diff --git a/upstreamed/redmine/README.md b/upstreamed/redmine/README.md index 9f43b1b179..50999ee147 100644 --- a/upstreamed/redmine/README.md +++ b/upstreamed/redmine/README.md @@ -178,6 +178,14 @@ $ helm install --name test --set persistence.existingClaim=PVC_REDMINE,mariadb.p ## Upgrading +### 13.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/17309 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 5.0.0 Backwards compatibility is not guaranteed unless you modify the labels used on the chart's deployments. diff --git a/upstreamed/redmine/requirements.lock b/upstreamed/redmine/requirements.lock index 7e7dd799eb..01999824f7 100644 --- a/upstreamed/redmine/requirements.lock +++ b/upstreamed/redmine/requirements.lock @@ -1,9 +1,9 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 + version: 7.0.0 - name: postgresql repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.5.4 -digest: sha256:ee162ec03d9c5f09b7cab23f9fc3d98481694ff8295405c6089ea9dd7470d7fa -generated: 2019-10-29T16:20:12.290649596Z + version: 7.0.0 +digest: sha256:c5ed9aba5b8df7c81b029047541d0b75e26b4d7eaf34ea03e09f4d76ac4cc6d4 +generated: "2019-11-09T11:28:29.844388656+05:30" diff --git a/upstreamed/redmine/requirements.yaml b/upstreamed/redmine/requirements.yaml index b02dd6432b..9f3efd7dfa 100644 --- a/upstreamed/redmine/requirements.yaml +++ b/upstreamed/redmine/requirements.yaml @@ -1,9 +1,9 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled - name: postgresql - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: postgresql.enabled diff --git a/upstreamed/redmine/templates/_helpers.tpl b/upstreamed/redmine/templates/_helpers.tpl index 1c85d21b75..9d092bf565 100644 --- a/upstreamed/redmine/templates/_helpers.tpl +++ b/upstreamed/redmine/templates/_helpers.tpl @@ -132,3 +132,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 "redmine.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/redmine/templates/deployment.yaml b/upstreamed/redmine/templates/deployment.yaml index ca667e202a..f64beda188 100644 --- a/upstreamed/redmine/templates/deployment.yaml +++ b/upstreamed/redmine/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if or .Values.databaseType.mariadb .Values.databaseType.postgresql }} -apiVersion: apps/v1 +apiVersion: {{ template "redmine.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "redmine.fullname" . }} diff --git a/upstreamed/suitecrm/Chart.yaml b/upstreamed/suitecrm/Chart.yaml index fe195a6fb9..6077465c9e 100644 --- a/upstreamed/suitecrm/Chart.yaml +++ b/upstreamed/suitecrm/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: suitecrm -version: 7.2.8 +version: 8.0.0 appVersion: 7.11.8 description: SuiteCRM is a completely open source enterprise-grade Customer Relationship Management (CRM) application. SuiteCRM is a software fork of the popular customer relationship management (CRM) system SugarCRM. keywords: diff --git a/upstreamed/suitecrm/README.md b/upstreamed/suitecrm/README.md index 7228baa621..6fb8e8bc7f 100644 --- a/upstreamed/suitecrm/README.md +++ b/upstreamed/suitecrm/README.md @@ -169,6 +169,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### 8.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/17310 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/upstreamed/suitecrm/requirements.lock b/upstreamed/suitecrm/requirements.lock index c14b5ff394..031aa61300 100644 --- a/upstreamed/suitecrm/requirements.lock +++ b/upstreamed/suitecrm/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.11.0 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-09T09:50:30.242355041Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:30:27.549311451+05:30" diff --git a/upstreamed/suitecrm/requirements.yaml b/upstreamed/suitecrm/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/suitecrm/requirements.yaml +++ b/upstreamed/suitecrm/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/suitecrm/templates/_helpers.tpl b/upstreamed/suitecrm/templates/_helpers.tpl index 50a1e93e68..bb4fe87841 100644 --- a/upstreamed/suitecrm/templates/_helpers.tpl +++ b/upstreamed/suitecrm/templates/_helpers.tpl @@ -174,3 +174,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 "suitecrm.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/suitecrm/templates/deployment.yaml b/upstreamed/suitecrm/templates/deployment.yaml index caa2270d52..28d2ca73e9 100644 --- a/upstreamed/suitecrm/templates/deployment.yaml +++ b/upstreamed/suitecrm/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if include "host" . -}} -apiVersion: apps/v1 +apiVersion: {{ template "suitecrm.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "suitecrm.fullname" . }} diff --git a/upstreamed/testlink/Chart.yaml b/upstreamed/testlink/Chart.yaml index a15f593d0b..9f2686a87c 100644 --- a/upstreamed/testlink/Chart.yaml +++ b/upstreamed/testlink/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: testlink -version: 6.3.6 +version: 7.0.0 appVersion: 1.9.19 description: Web-based test management system that facilitates software quality assurance. icon: https://bitnami.com/assets/stacks/testlink/img/testlink-stack-220x234.png diff --git a/upstreamed/testlink/README.md b/upstreamed/testlink/README.md index d629c3e4a5..0132a0cf83 100644 --- a/upstreamed/testlink/README.md +++ b/upstreamed/testlink/README.md @@ -152,6 +152,14 @@ See the [Parameters](#parameters) section to configure the PVC or to disable per ## Upgrading +### 7.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/17311 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/upstreamed/testlink/requirements.lock b/upstreamed/testlink/requirements.lock index 80996a8010..623c2888d3 100644 --- a/upstreamed/testlink/requirements.lock +++ b/upstreamed/testlink/requirements.lock @@ -1,6 +1,6 @@ dependencies: - name: mariadb repository: https://kubernetes-charts.storage.googleapis.com/ - version: 6.12.2 -digest: sha256:a363428d6463718a9523a88c70e485218373e315f2979cb1bb17b034ec2be96a -generated: 2019-10-29T16:04:10.635616467Z + version: 7.0.0 +digest: sha256:cd64413a4a697ccf85c0091e9c55cdc5876938ddced84c05d37c57ff9abc5864 +generated: "2019-11-09T11:32:20.387479352+05:30" diff --git a/upstreamed/testlink/requirements.yaml b/upstreamed/testlink/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/upstreamed/testlink/requirements.yaml +++ b/upstreamed/testlink/requirements.yaml @@ -1,5 +1,5 @@ dependencies: - name: mariadb - version: 6.x.x + version: 7.x.x repository: https://kubernetes-charts.storage.googleapis.com/ condition: mariadb.enabled diff --git a/upstreamed/testlink/templates/_helpers.tpl b/upstreamed/testlink/templates/_helpers.tpl index b390ff4979..9c35e5448c 100644 --- a/upstreamed/testlink/templates/_helpers.tpl +++ b/upstreamed/testlink/templates/_helpers.tpl @@ -153,3 +153,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 "testlink.deployment.apiVersion" -}} +{{- if semverCompare "<1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- print "extensions/v1beta1" -}} +{{- else -}} +{{- print "apps/v1" -}} +{{- end -}} +{{- end -}} diff --git a/upstreamed/testlink/templates/deployment.yaml b/upstreamed/testlink/templates/deployment.yaml index 1965745ead..273657784b 100644 --- a/upstreamed/testlink/templates/deployment.yaml +++ b/upstreamed/testlink/templates/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: apps/v1 +apiVersion: {{ template "testlink.deployment.apiVersion" . }} kind: Deployment metadata: name: {{ template "testlink.fullname" . }}