Merge pull request #4393 from chaosi-zju/hook-delete-policy

make hook-delete-policy in helm job configurable
karmada-io · Dec 15, 2023 · 90bdfcb · 90bdfcb
2 parents f7b6e79 + 9315b02
commit 90bdfcb
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/charts/karmada/templates/post-delete-job.yaml b/charts/karmada/templates/post-delete-job.yaml
@@ -14,7 +14,7 @@ metadata:
     # job is considered part of the release.
     "helm.sh/hook": post-delete
     "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": {{ .Values.postDeleteJob.hookDeletePolicy }}
 spec:
   parallelism: 1
   completions: 1

diff --git a/charts/karmada/templates/post-install-job.yaml b/charts/karmada/templates/post-install-job.yaml
@@ -17,7 +17,7 @@ metadata:
     # job is considered part of the release.
     "helm.sh/hook": post-install
     "helm.sh/hook-weight": "0"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": {{ .Values.postInstallJob.hookDeletePolicy }}
 spec:
   parallelism: 1
   completions: 1

diff --git a/charts/karmada/templates/pre-install-job.yaml b/charts/karmada/templates/pre-install-job.yaml
@@ -307,7 +307,7 @@ metadata:
     # job is considered part of the release.
     "helm.sh/hook": pre-install
     "helm.sh/hook-weight": "3"
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": {{ .Values.preInstallJob.hookDeletePolicy }}
   {{- if "karmada.preInstallJob.labels" }}
   labels:
     {{- include "karmada.preInstallJob.labels" . | nindent 4 }}

diff --git a/charts/karmada/values.yaml b/charts/karmada/values.yaml
@@ -79,16 +79,22 @@ kubectl:
 preInstallJob:
   tolerations: []
   nodeSelector: {}
+  ## Define policies that determine when to delete corresponding hook resources: before-hook-creation,hook-succeeded,hook-failed
+  hookDeletePolicy: "hook-succeeded"
 
 ## post-install job config
 postInstallJob:
   tolerations: []
   nodeSelector: {}
+  ## Define policies that determine when to delete corresponding hook resources: before-hook-creation,hook-succeeded,hook-failed
+  hookDeletePolicy: "hook-succeeded"
 
 ## post-delete job config
 postDeleteJob:
   tolerations: []
   nodeSelector: {}
+  ## Define policies that determine when to delete corresponding hook resources: before-hook-creation,hook-succeeded,hook-failed
+  hookDeletePolicy: "hook-succeeded"
 
 ## karmada certificate config
 certs: