Merge pull request #8561 from subhamkrai/helm-k8s-check

ceph: add `-0` for helm k8s version check
rook · Aug 18, 2021 · 67acab9 · 67acab9
2 parents c00b290 + 1681cfe
commit 67acab9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/crds/build-crds.sh b/build/crds/build-crds.sh
@@ -97,7 +97,7 @@ build_helm_resources() {
   {
     # add header
     echo "{{- if .Values.crds.enabled }}"
-    echo "{{- if semverCompare \">=1.16.0\" .Capabilities.KubeVersion.GitVersion }}"
+    echo "{{- if semverCompare \">=1.16.0-0\" .Capabilities.KubeVersion.GitVersion }}"
 
     # Add helm annotations to all CRDS and skip the first 4 lines of crds.yaml
     "$YQ_BIN_PATH" w -d'*' "$CEPH_CRDS_FILE_PATH" "metadata.annotations[helm.sh/resource-policy]" keep | tail -n +5

diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.crds.enabled }}
-{{- if semverCompare ">=1.16.0" .Capabilities.KubeVersion.GitVersion }}
+{{- if semverCompare ">=1.16.0-0" .Capabilities.KubeVersion.GitVersion }}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata: