From cb429c0bc538066bc74ccc1b79b16d674a959b2f Mon Sep 17 00:00:00 2001 From: Sameer Naik Date: Tue, 12 Nov 2019 14:16:30 +0530 Subject: [PATCH] [stable/osclass] bump major version (#18700) 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. Signed-off-by: Sameer Naik --- stable/osclass/Chart.yaml | 2 +- stable/osclass/README.md | 8 ++++++++ stable/osclass/requirements.lock | 6 +++--- stable/osclass/requirements.yaml | 2 +- stable/osclass/templates/_helpers.tpl | 11 +++++++++++ stable/osclass/templates/deployment.yaml | 2 +- 6 files changed, 25 insertions(+), 6 deletions(-) diff --git a/stable/osclass/Chart.yaml b/stable/osclass/Chart.yaml index 39720f457e..40ff49ec46 100644 --- a/stable/osclass/Chart.yaml +++ b/stable/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/stable/osclass/README.md b/stable/osclass/README.md index 9ca7b691ae..d88ccd9298 100644 --- a/stable/osclass/README.md +++ b/stable/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/stable/osclass/requirements.lock b/stable/osclass/requirements.lock index 7c8c5e337c..2a109bebd8 100644 --- a/stable/osclass/requirements.lock +++ b/stable/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/stable/osclass/requirements.yaml b/stable/osclass/requirements.yaml index 127c019356..389c9f3cba 100644 --- a/stable/osclass/requirements.yaml +++ b/stable/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/stable/osclass/templates/_helpers.tpl b/stable/osclass/templates/_helpers.tpl index 2166c4434d..f3a887ebce 100644 --- a/stable/osclass/templates/_helpers.tpl +++ b/stable/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/stable/osclass/templates/deployment.yaml b/stable/osclass/templates/deployment.yaml index 0988afdd63..5b182c3523 100644 --- a/stable/osclass/templates/deployment.yaml +++ b/stable/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" . }}