From eb5dc1da0f1b85ef34b9d1fce03e286dab138cc3 Mon Sep 17 00:00:00 2001
From: Tiansu <tiansuyu2020@icloud.com>
Date: Thu, 18 Nov 2021 02:45:15 +0100
Subject: [PATCH] delete-service-accounts-and-roles-before-creation (#1384)

* delete-service-accounts-and-roles-before-creation

* bump spark-operator version
---
 charts/spark-operator-chart/Chart.yaml                    | 2 +-
 charts/spark-operator-chart/templates/rbac.yaml           | 4 ++--
 charts/spark-operator-chart/templates/serviceaccount.yaml | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/charts/spark-operator-chart/Chart.yaml b/charts/spark-operator-chart/Chart.yaml
index 7bf4427b3..c11d09f9a 100644
--- a/charts/spark-operator-chart/Chart.yaml
+++ b/charts/spark-operator-chart/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: spark-operator
 description: A Helm chart for Spark on Kubernetes operator
-version: 1.1.12
+version: 1.1.13
 appVersion: v1beta2-1.2.3-3.1.1
 keywords:
   - spark
diff --git a/charts/spark-operator-chart/templates/rbac.yaml b/charts/spark-operator-chart/templates/rbac.yaml
index 3ef07076b..192c013bc 100644
--- a/charts/spark-operator-chart/templates/rbac.yaml
+++ b/charts/spark-operator-chart/templates/rbac.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "spark-operator.fullname" . }}
   annotations:
     "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": hook-failed
+    "helm.sh/hook-delete-policy": hook-failed, before-hook-creation
   labels:
     {{- include "spark-operator.labels" . | nindent 4 }}
 rules:
@@ -113,7 +113,7 @@ metadata:
   name: {{ include "spark-operator.fullname" . }}
   annotations:
     "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": hook-failed
+    "helm.sh/hook-delete-policy": hook-failed, before-hook-creation
   labels:
     {{- include "spark-operator.labels" . | nindent 4 }}
 subjects:
diff --git a/charts/spark-operator-chart/templates/serviceaccount.yaml b/charts/spark-operator-chart/templates/serviceaccount.yaml
index eab0a2ab6..fb5591ba5 100644
--- a/charts/spark-operator-chart/templates/serviceaccount.yaml
+++ b/charts/spark-operator-chart/templates/serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "spark-operator.serviceAccountName" . }}
   annotations:
     "helm.sh/hook": pre-install
-    "helm.sh/hook-delete-policy": hook-failed
+    "helm.sh/hook-delete-policy": hook-failed, before-hook-creation
 {{- with .Values.serviceAccounts.sparkoperator.annotations }}
 {{ toYaml . | indent 4 }}
 {{- end }}