Make one variable for all hooks

Signed-off-by: Igor Cezar <[email protected]>
vmware-tanzu · Oct 15, 2020 · cec4978 · cec4978
1 parent 0d0acb0
commit cec4978
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 8 deletions.
diff --git a/charts/velero/templates/backupstoragelocation.yaml b/charts/velero/templates/backupstoragelocation.yaml
@@ -4,7 +4,7 @@ kind: BackupStorageLocation
 metadata:
   name: {{ include "velero.backupStorageLocation.name" . }}
   annotations:
-  {{- if .Values.enableHelmHooks.templates }}
+  {{- if .Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
   {{- end }}

diff --git a/charts/velero/templates/crds.yaml b/charts/velero/templates/crds.yaml
@@ -1,6 +1,6 @@
 {{- if and .Values.installCRDs (eq .Release.Service "Tiller") }}
 {{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
-{{- if $.Values.enableHelmHooks.crds }}
+{{- if $.Values.enableHelmHooks }}
 {{ $.Files.Get $path }}
 {{- else }}
 {{- range $.Files.Lines $path }}

diff --git a/charts/velero/templates/schedule.yaml b/charts/velero/templates/schedule.yaml
@@ -4,7 +4,7 @@ kind: Schedule
 metadata:
   name: {{ include "velero.fullname" $ }}-{{ $scheduleName }}
   annotations:
-  {{- if $.Values.enableHelmHooks.templates }}
+  {{- if $.Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
   {{- end }}

diff --git a/charts/velero/templates/volumesnapshotlocation.yaml b/charts/velero/templates/volumesnapshotlocation.yaml
@@ -4,7 +4,7 @@ kind: VolumeSnapshotLocation
 metadata:
   name: {{ include "velero.volumeSnapshotLocation.name" . }}
   annotations:
-  {{- if .Values.enableHelmHooks.templates }}
+  {{- if .Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
   {{- end }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -72,11 +72,9 @@ metrics:
 # Install CRDs as a templates. Enabled by default.
 installCRDs: true
 
-# Enable/disable helm hooks annotations for Helm v2 in CRDs and/or templates
+# Enable/disable helm hooks annotations for CRDs (Helm v2) and templates
 # You should disable this if using a deploy tool that doesn't support helm hooks
-enableHelmHooks:
-  crds: true
-  templates: true
+enableHelmHooks: true
 
 ##
 ## End of deployment-related settings.