fix: crds getting removed on helm upgrades

Signed-off-by: Abhinandan Purkait <[email protected]>
openebs · Mar 27, 2024 · 070aae1 · 070aae1
1 parent 549724e
commit 070aae1
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 26 deletions.
diff --git a/ct.yaml b/ct.yaml
@@ -4,3 +4,4 @@ target-branch: develop
 chart-dirs:
   - deploy/helm
 helm-extra-args: --timeout=500s
+validate-maintainers: false
diff --git a/deploy/helm/charts/charts/crds/templates/_helpers.tpl b/deploy/helm/charts/charts/crds/templates/_helpers.tpl
@@ -1,20 +1,4 @@
-{{/*
-    This returns a "1" if the CRD is absent in the cluster
-    Usage:
-      {{- if (include "crdIsAbsent" (list <crd-name>)) -}}
-      # CRD Yaml
-      {{- end -}}
-*/}}
-{{- define "crdIsAbsent" -}}
-    {{- $crdName := index . 0 -}}
-    {{- $crd := lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" $crdName -}}
-    {{- $output := "1" -}}
-    {{- if $crd -}}
-        {{- $output = "" -}}
-    {{- end -}}
-
-    {{- $output -}}
-{{- end -}}
+{{/* vim: set filetype=mustache: */}}
 
 {{/*
     Adds extra annotations to CRDs. This targets two scenarios: preventing CRD recycling in case

diff --git a/deploy/helm/charts/charts/crds/templates/lvmnode.yaml b/deploy/helm/charts/charts/crds/templates/lvmnode.yaml
@@ -1,6 +1,4 @@
 {{- if .Values.lvmLocalPv.enabled -}}
-{{- $crdName := "lvmnodes.local.openebs.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################
 ###########                       ############
 ###########     LVMNode CRD       ############
@@ -177,5 +175,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
 {{- end -}}
diff --git a/deploy/helm/charts/charts/crds/templates/lvmsnapshot.yaml b/deploy/helm/charts/charts/crds/templates/lvmsnapshot.yaml
@@ -1,6 +1,4 @@
 {{- if .Values.lvmLocalPv.enabled -}}
-{{- $crdName := "lvmsnapshots.local.openebs.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################
 ###########                       ############
 ###########   LVMSnapshot CRD     ############
@@ -85,5 +83,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
 {{- end -}}
diff --git a/deploy/helm/charts/charts/crds/templates/lvmvolume.yaml b/deploy/helm/charts/charts/crds/templates/lvmvolume.yaml
@@ -1,6 +1,4 @@
 {{- if .Values.lvmLocalPv.enabled -}}
-{{- $crdName := "lvmvolumes.local.openebs.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 ##############################################
 ###########                       ############
 ###########   LVMVolume CRD       ############
@@ -153,5 +151,4 @@ status:
     plural: ""
   conditions: []
   storedVersions: []
-{{- end -}}
 {{- end -}}