Adjust hook delete policy

giantswarm · Oct 6, 2020 · a423834 · a423834
1 parent 2c398bc
commit a423834
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -23,6 +23,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
     - [`upstream-keepalive-requests`](https://github.com/kubernetes/ingress-nginx/blob/master/docs/user-guide/nginx-configuration/configmap.md#upstream-keepalive-requests) changed from `100` to `10000`
 - Support and enable by default [mimalloc](https://github.com/microsoft/mimalloc) as a drop-in malloc replacement to reduce nginx memory utilization.
 - Support configuring additional environment variables for NGINX Ingress Controller container, to support configuring additional mimalloc [options](https://github.com/microsoft/mimalloc#environment-options).
+- Adjust `hook-delete-policy` to make admission webhook management more reliable.
 
 ## [1.9.2] - 2020-09-02
 

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/clusterrole.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/clusterrole.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/...inx-ingress-controller-app/templates/admission-webhooks/job-patch/clusterrolebinding.yaml b/...inx-ingress-controller-app/templates/admission-webhooks/job-patch/clusterrolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
   name:  {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/...nginx-ingress-controller-app/templates/admission-webhooks/job-patch/job-createSecret.yaml b/...nginx-ingress-controller-app/templates/admission-webhooks/job-patch/job-createSecret.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "0"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/...nginx-ingress-controller-app/templates/admission-webhooks/job-patch/job-patchWebhook.yaml b/...nginx-ingress-controller-app/templates/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -6,7 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "0"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/np.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/np.yaml
@@ -5,7 +5,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/psp.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/psp.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/role.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/role.yaml
@@ -5,7 +5,7 @@ metadata:
   name:  {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/rolebinding.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/rolebinding.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}

diff --git a/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/serviceaccount.yaml b/helm/nginx-ingress-controller-app/templates/admission-webhooks/job-patch/serviceaccount.yaml
@@ -5,7 +5,7 @@ metadata:
   name: {{ include "resource.default.name" . }}-admission
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade,post-install,post-upgrade
-    "helm.sh/hook-delete-policy": before-hook-creation,hook-succeeded
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded,hook-failed"
     "helm.sh/hook-weight": "-1"
   labels:
     {{- include "labels.common" . | nindent 4 }}