Remove enableHelmHooks

Signed-off-by: JenTing Hsiao <[email protected]>

charts/velero/templates/_helpers.tpl

@@ -110,11 +110,3 @@ Create the volume snapshot location provider
 {{ default .provider .volumeSnapshotLocation.provider }}
 {{- end -}}
 {{- end -}}
-
-{{/*
-Helm hooks for Helm v2 CRDs 
-*/}}
-{{- define "velero.helmhooks.crds" -}}
-{{ print "\"helm.sh/hook\": pre-install,pre-upgrade" | indent 4 }}
-{{ print "\"helm.sh/hook-delete-policy\": \"before-hook-creation\"" | indent 4 }}
-{{- end -}}

charts/velero/templates/backupstoragelocation.yaml

@@ -4,10 +4,8 @@ kind: BackupStorageLocation
 metadata:
   name: {{ include "velero.backupStorageLocation.name" . }}
   annotations:
-  {{- if .Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
-  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/velero/templates/crds.yaml

@@ -1,17 +1,6 @@
-{{- if and .Values.installCRDs (eq .Release.Service "Tiller") }}
+{{- if .Values.installCRDs }}
 {{- range $path, $bytes := .Files.Glob "crds/*.yaml" }}
-{{- if not $.Values.enableHelmHooks }}
 {{ $.Files.Get $path }}
-{{- else }}
-{{- range $.Files.Lines $path }}
-{{- if contains "annotations:" . }}
-{{ . }}
-{{ template "velero.helmhooks.crds" . }}
-{{- else }}
-{{ . }}
-{{- end }}
-{{- end }}
-{{- end }}
 ---
 {{- end }}
 {{- end }}

charts/velero/templates/schedule.yaml

@@ -7,10 +7,8 @@ metadata:
   {{- if $schedule.annotations }}
     {{- toYaml $schedule.annotations | nindent 4 }}
   {{- end }}
-  {{- if $.Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
-  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" $ }}
     app.kubernetes.io/instance: {{ $.Release.Name }}

charts/velero/templates/volumesnapshotlocation.yaml

@@ -4,10 +4,8 @@ kind: VolumeSnapshotLocation
 metadata:
   name: {{ include "velero.volumeSnapshotLocation.name" . }}
   annotations:
-  {{- if .Values.enableHelmHooks }}
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-delete-policy": "before-hook-creation"
-  {{- end }}
   labels:
     app.kubernetes.io/name: {{ include "velero.name" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}

charts/velero/values.yaml

@@ -101,11 +101,6 @@ metrics:
 # Install CRDs as a templates. Enabled by default.
 installCRDs: true
 
-# Enable/disable all helm hooks annotations
-# You should disable this if using a deploy tool that doesn't support helm hooks,
-# such as ArgoCD
-enableHelmHooks: true
-
 ##
 ## End of deployment-related settings.
 ##