chore(bors): merge pull request #459

459: Cherry helm PR 458 r=tiagolobocastro a=tiagolobocastro <! Co-authored-by: cmontemuino <[email protected]>
openebs · Apr 2, 2024 · 747d349 · 747d349
2 parents 0da7271 + 3262b9f
commit 747d349
Show file tree

Hide file tree

Showing 7 changed files with 38 additions and 25 deletions.
diff --git a/chart/charts/crds/README.md b/chart/charts/crds/README.md
@@ -6,6 +6,10 @@ A Helm chart that collects CustomResourceDefinitions (CRDs) from Mayastor.
 
 | Key | Description | Default |
 |:----|:------------|:--------|
+| csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;annotations | Annotations to be added to all CRDs | <pre>{<br><br>}</pre> |
 | csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;enabled | Install Volume Snapshot CRDs | `true` |
+| csi.&ZeroWidthSpace;volumeSnapshots.&ZeroWidthSpace;keep | Keep CRDs on chart uninstall | `true` |
+| jaeger.&ZeroWidthSpace;annotations | Annotations to be added to all CRDs | <pre>{<br><br>}</pre> |
 | jaeger.&ZeroWidthSpace;enabled | Install Jaeger CRDs | `true` |
+| jaeger.&ZeroWidthSpace;keep | Keep CRDs on chart uninstall | `true` |
 
diff --git a/chart/charts/crds/templates/_helpers.tpl b/chart/charts/crds/templates/_helpers.tpl
@@ -1,19 +1,20 @@
 {{/* vim: set filetype=mustache: */}}
 
 {{/*
-    This returns a "1" if the CRD is absent in the cluster
+    Adds extra annotations to CRDs. This targets two scenarios: preventing CRD recycling in case
+    the chart is removed; and adding custom annotations.
+    NOTE: This function assumes the element `metadata.annotations` already exists.
+
     Usage:
-      {{- if (include "crdIsAbsent" (list <crd-name>)) -}}
-      # CRD Yaml
-      {{- end -}}
+      {{- include "crds.extraAnnotations" .Values.csi.volumeSnapshots | nindent 4 }}
 */}}
-{{- define "crdIsAbsent" -}}
-    {{- $crdName := index . 0 -}}
-    {{- $crd := lookup "apiextensions.k8s.io/v1" "CustomResourceDefinition" "" $crdName -}}
-    {{- $output := "1" -}}
-    {{- if $crd -}}
-        {{- $output = "" -}}
-    {{- end -}}
 
-    {{- $output -}}
-{{- end -}}
+{{- define "crds.extraAnnotations" -}}
+{{- if .keep -}}
+helm.sh/resource-policy: keep
+{{ end }}
+{{- with .annotations }}
+  {{- toYaml . }}
+{{- end }}
+{{- end -}}
+
diff --git a/chart/charts/crds/templates/csi-volume-snapshot-class.yaml b/chart/charts/crds/templates/csi-volume-snapshot-class.yaml
@@ -1,12 +1,11 @@
 {{- if .Values.csi.volumeSnapshots.enabled -}}
-{{- $crdName := "volumesnapshotclasses.snapshot.storage.k8s.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
     controller-gen.kubebuilder.io/version: v0.11.3
+    {{- include "crds.extraAnnotations" .Values.csi.volumeSnapshots | nindent 4 }}
   creationTimestamp: null
   name: volumesnapshotclasses.snapshot.storage.k8s.io
 spec:
@@ -149,4 +148,3 @@ status:
   conditions: []
   storedVersions: []
 {{- end -}}
-{{- end -}}
diff --git a/chart/charts/crds/templates/csi-volume-snapshot-content.yaml b/chart/charts/crds/templates/csi-volume-snapshot-content.yaml
@@ -1,12 +1,11 @@
 {{- if .Values.csi.volumeSnapshots.enabled -}}
-{{- $crdName := "volumesnapshotcontents.snapshot.storage.k8s.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
     controller-gen.kubebuilder.io/version: v0.11.3
+    {{- include "crds.extraAnnotations" .Values.csi.volumeSnapshots | nindent 4 }}
   creationTimestamp: null
   name: volumesnapshotcontents.snapshot.storage.k8s.io
 spec:
@@ -487,4 +486,3 @@ status:
   conditions: []
   storedVersions: []
 {{- end -}}
-{{- end -}}
diff --git a/chart/charts/crds/templates/csi-volume-snapshot.yaml b/chart/charts/crds/templates/csi-volume-snapshot.yaml
@@ -1,12 +1,11 @@
 {{- if .Values.csi.volumeSnapshots.enabled -}}
-{{- $crdName := "volumesnapshots.snapshot.storage.k8s.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
     api-approved.kubernetes.io: https://github.com/kubernetes-csi/external-snapshotter/pull/814
     controller-gen.kubebuilder.io/version: v0.11.3
+    {{- include "crds.extraAnnotations" .Values.csi.volumeSnapshots | nindent 4 }}
   creationTimestamp: null
   name: volumesnapshots.snapshot.storage.k8s.io
 spec:
@@ -389,4 +388,3 @@ status:
   conditions: []
   storedVersions: []
 {{- end -}}
-{{- end -}}
diff --git a/chart/charts/crds/templates/jaeger.yaml b/chart/charts/crds/templates/jaeger.yaml
@@ -1,10 +1,12 @@
 {{- if .Values.jaeger.enabled -}}
-{{- $crdName := "jaegers.jaegertracing.io" -}}
-{{- if (include "crdIsAbsent" (list $crdName)) -}}
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   name: jaegers.jaegertracing.io
+  {{- if or (.Values.jaeger.keep) (.Values.jaeger.annotations) }}
+  annotations:
+    {{- include "crds.extraAnnotations" .Values.jaeger | nindent 4 }}
+  {{- end }}
   labels:
     app: jaeger-operator
 spec:
@@ -46,4 +48,3 @@ spec:
       subresources:
         status: {}
 {{- end -}}
-{{- end -}}
diff --git a/chart/charts/crds/values.yaml b/chart/charts/crds/values.yaml
@@ -1,8 +1,21 @@
 jaeger:
   # -- Install Jaeger CRDs
   enabled: true
+  # -- Keep CRDs on chart uninstall
+  keep: true
+  # -- Annotations to be added to all CRDs
+  annotations: {}
+    # Example for Argo CD to prevent CRDs from being recycled
+    # argocd.argoproj.io/sync-options: Prune=false
 
 csi:
   volumeSnapshots:
     # -- Install Volume Snapshot CRDs
     enabled: true
+    # -- Keep CRDs on chart uninstall
+    keep: true
+    # -- Annotations to be added to all CRDs
+    annotations: {}
+    # Example for Argo CD to prevent CRDs from being recycled
+    # argocd.argoproj.io/sync-options: Prune=false
+