From a7f351fb09f5d69166da711264092f2e2fbc5e40 Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Tue, 24 Mar 2020 14:13:01 +0100
Subject: [PATCH] make sure hooks are deleted before re-installing NC

---
 templates/job-configure-nextcloud.yaml | 2 +-
 templates/job-setup-apps.yaml          | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/templates/job-configure-nextcloud.yaml b/templates/job-configure-nextcloud.yaml
index c8856f1a..902797bf 100644
--- a/templates/job-configure-nextcloud.yaml
+++ b/templates/job-configure-nextcloud.yaml
@@ -9,7 +9,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "1"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   template:
     metadata:
diff --git a/templates/job-setup-apps.yaml b/templates/job-setup-apps.yaml
index 85796918..95050353 100644
--- a/templates/job-setup-apps.yaml
+++ b/templates/job-setup-apps.yaml
@@ -1,5 +1,3 @@
-# Work around the fact that we can not index hyphenated names
-# (https://github.com/helm/helm/issues/2993)
 apiVersion: batch/v1
 kind: Job
 metadata:
@@ -11,7 +9,7 @@ metadata:
   annotations:
     "helm.sh/hook": post-install,post-upgrade
     "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
 spec:
   backoffLimit: {{ .Values.setupApps.backoffLimit }}
   template:
-- 
GitLab