From 0fd395f675c2cb25039fcf63097fd31d557d77e9 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Mon, 3 Sep 2018 20:20:47 -0700 Subject: [PATCH] Cleanup webhooks when chart is deleted Signed-off-by: Tamal Saha --- chart/searchlight/templates/cleaner.yaml | 26 +++++++++++++++++++ chart/searchlight/templates/cluster-role.yaml | 7 ++--- 2 files changed, 30 insertions(+), 3 deletions(-) create mode 100644 chart/searchlight/templates/cleaner.yaml diff --git a/chart/searchlight/templates/cleaner.yaml b/chart/searchlight/templates/cleaner.yaml new file mode 100644 index 000000000..3e487e9ef --- /dev/null +++ b/chart/searchlight/templates/cleaner.yaml @@ -0,0 +1,26 @@ +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ .Release.Name }}-cleaner + labels: + chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" + app: "{{ template "searchlight.name" . }}" + heritage: "{{ .Release.Service }}" + release: "{{ .Release.Name }}" + annotations: + "helm.sh/hook": pre-delete + "helm.sh/hook-delete-policy": hook-succeeded,hook-failed +spec: + backoffLimit: 3 + activeDeadlineSeconds: 120 + template: + spec: + containers: + - name: busybox + image: appscode/kubectl:v1.11 + command: + - sh + - -c + - "sleep 2; kubectl delete validatingwebhookconfigurations admission.monitoring.appscode.com || true" + imagePullPolicy: IfNotPresent + restartPolicy: Never diff --git a/chart/searchlight/templates/cluster-role.yaml b/chart/searchlight/templates/cluster-role.yaml index 39ade588a..6e1e07b7b 100644 --- a/chart/searchlight/templates/cluster-role.yaml +++ b/chart/searchlight/templates/cluster-role.yaml @@ -16,11 +16,12 @@ rules: verbs: - "*" - apiGroups: - - extensions + - admissionregistration.k8s.io resources: - - thirdpartyresources + - mutatingwebhookconfigurations + - validatingwebhookconfigurations verbs: - - "*" + - delete - apiGroups: - monitoring.appscode.com resources: ["*"]