From d04bfe890f380898cee2d1e22b81d80bf6839d28 Mon Sep 17 00:00:00 2001 From: Rakshith R Date: Mon, 10 May 2021 16:16:14 +0530 Subject: [PATCH] helm: fix k8s version string for csidriver crds semverCompare Current implementation of semvercompare fails against pre-release versions. This commit fixes it by using the entire version string at which csidriver api became GA. s|">=1.18"|">=1.18.0-beta.1" Fixes: #2039 Signed-off-by: Rakshith R --- charts/ceph-csi-cephfs/templates/csidriver-crd.yaml | 2 +- charts/ceph-csi-rbd/templates/csidriver-crd.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml b/charts/ceph-csi-cephfs/templates/csidriver-crd.yaml index 4b02aa0f5..5229faa93 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.Version }} +{{ if semverCompare ">=1.18.0-beta.1" .Capabilities.KubeVersion.Version }} apiVersion: storage.k8s.io/v1 {{ else }} apiVersion: storage.k8s.io/v1betav1 diff --git a/charts/ceph-csi-rbd/templates/csidriver-crd.yaml b/charts/ceph-csi-rbd/templates/csidriver-crd.yaml index 7bbbace7f..4e6966fdc 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.Version }} +{{ if semverCompare ">=1.18.0-beta.1" .Capabilities.KubeVersion.Version }} apiVersion: storage.k8s.io/v1 {{ else }} apiVersion: storage.k8s.io/betav1