From 3505731c42c8317265bef0d7201e8f0d5c989e8a Mon Sep 17 00:00:00 2001 From: Matthias Neugebauer Date: Sun, 25 Apr 2021 00:05:30 +0200 Subject: [PATCH] Replace deprecated GitVersion with Version This replaces the deprecated `GitVersion` with `Version`. See https://github.com/helm/helm/blob/a499b4b179307c267bdf3ec49b880e3dbd2a5591/pkg/chartutil/capabilities.go#L71-L74 Signed-off-by: Matthias Neugebauer --- charts/ceph-csi-cephfs/templates/csidriver-crd.yaml | 2 +- charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml | 2 +- charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml | 2 +- charts/ceph-csi-rbd/templates/csidriver-crd.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml index e085efd6f..4b02aa0f5 100644 --- a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml +++ b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml @@ -1,4 +1,4 @@ -{{ if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.18" .Capabilities.KubeVersion.Version }} apiVersion: storage.k8s.io/v1 {{ else }} apiVersion: storage.k8s.io/v1betav1 diff --git a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml index a181837d4..c970766e5 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-clusterrole.yaml @@ -45,7 +45,7 @@ rules: resources: ["volumeattachments/status"] verbs: ["patch"] {{- end -}} -{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}} {{- if .Values.provisioner.resizer.enabled }} - apiGroups: [""] resources: ["persistentvolumeclaims/status"] diff --git a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml index 72054f7f4..8d6168a29 100644 --- a/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml +++ b/charts/ceph-csi-cephfs/templates/provisioner-deployment.yaml @@ -103,7 +103,7 @@ spec: resources: {{ toYaml .Values.nodeplugin.plugin.resources | indent 12 }} {{- end }} -{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.15" .Capabilities.KubeVersion.Version -}} {{- if .Values.provisioner.resizer.enabled }} - name: csi-resizer image: "{{ .Values.provisioner.resizer.image.repository }}:{{ .Values.provisioner.resizer.image.tag }}" diff --git a/charts/ceph-csi-rbd/templates/csidriver-crd.yaml b/charts/ceph-csi-rbd/templates/csidriver-crd.yaml index 4991bd4fc..7bbbace7f 100644 --- a/charts/ceph-csi-rbd/templates/csidriver-crd.yaml +++ b/charts/ceph-csi-rbd/templates/csidriver-crd.yaml @@ -1,4 +1,4 @@ -{{ if semverCompare ">=1.18" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.18" .Capabilities.KubeVersion.Version }} apiVersion: storage.k8s.io/v1 {{ else }} apiVersion: storage.k8s.io/betav1