Skip to content

Commit

Permalink
Remove helm hooks for the custom resources
Browse files Browse the repository at this point in the history
The PR #414 have moved the upgrade CRD job from post hook to pre hook to
ensure that the custom resources create/upgrade after the CRD
installed/upgraded.

Therefore, the helm hooks for the custom resources are no longer
required includes
- backupstoragelocations.velero.io
- volumesnapshotlocations.velero.io
- schedules.velero.io
  • Loading branch information
jenting committed Aug 13, 2023
1 parent d4e15ac commit 42be236
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 19 deletions.
2 changes: 1 addition & 1 deletion charts/velero/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ appVersion: 1.11.1
kubeVersion: ">=1.16.0-0"
description: A Helm chart for velero
name: velero
version: 4.4.1
version: 4.4.2
home: https://github.com/vmware-tanzu/velero
icon: https://cdn-images-1.medium.com/max/1600/1*-9mb3AKnKdcL_QD3CMnthQ.png
sources:
Expand Down
5 changes: 0 additions & 5 deletions charts/velero/templates/backupstoragelocation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ kind: BackupStorageLocation
metadata:
name: {{ .name | default "default" }}
namespace: {{ $.Release.Namespace }}
annotations:
{{- if $.Values.helmHookAnnotations }}
"helm.sh/hook": post-install,post-upgrade,post-rollback
"helm.sh/hook-delete-policy": before-hook-creation
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" $ }}
app.kubernetes.io/instance: {{ $.Release.Name }}
Expand Down
4 changes: 0 additions & 4 deletions charts/velero/templates/schedule.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,6 @@ metadata:
{{- if $schedule.annotations }}
{{- toYaml $schedule.annotations | nindent 4 }}
{{- end }}
{{- if $.Values.helmHookAnnotations }}
"helm.sh/hook": post-install,post-upgrade,post-rollback
"helm.sh/hook-delete-policy": before-hook-creation
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" $ }}
app.kubernetes.io/instance: {{ $.Release.Name }}
Expand Down
5 changes: 0 additions & 5 deletions charts/velero/templates/volumesnapshotlocation.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,6 @@ kind: VolumeSnapshotLocation
metadata:
name: {{ .name | default "default" }}
namespace: {{ $.Release.Namespace }}
annotations:
{{- if $.Values.helmHookAnnotations }}
"helm.sh/hook": post-install,post-upgrade,post-rollback
"helm.sh/hook-delete-policy": before-hook-creation
{{- end }}
labels:
app.kubernetes.io/name: {{ include "velero.name" $ }}
app.kubernetes.io/instance: {{ $.Release.Name }}
Expand Down
4 changes: 0 additions & 4 deletions charts/velero/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,6 @@ annotations: {}
# Labels to add to the Velero deployment's. Optional.
labels: {}

# helmHookAnnotations is required to deploy CustomResources after deploying CRDs. If you manage your CRDs outside of this helm chart
# or using ArgoCD, you are able to disable the helm hooks annotations.
helmHookAnnotations: true

# Annotations to add to the Velero deployment's pod template. Optional.
#
# If using kube2iam or kiam, use the following annotation with your AWS_ACCOUNT_ID
Expand Down

0 comments on commit 42be236

Please sign in to comment.