Use hooks for user roles and fix hook deletion policy

stashed · May 22, 2018 · e1b0d6c · e1b0d6c
1 parent bf59c61
commit e1b0d6c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/chart/stash/templates/mutating-webhook.yaml b/chart/stash/templates/mutating-webhook.yaml
@@ -10,7 +10,7 @@ metadata:
     release: "{{ .Release.Name }}"
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation
 webhooks:
 - name: deployment.admission.stash.appscode.com
   clientConfig:

diff --git a/chart/stash/templates/user-roles.yaml b/chart/stash/templates/user-roles.yaml
@@ -6,6 +6,9 @@ metadata:
   labels:
     rbac.authorization.k8s.io/aggregate-to-admin: "true"
     rbac.authorization.k8s.io/aggregate-to-edit: "true"
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation
 rules:
 - apiGroups:
   - stash.appscode.com
@@ -29,6 +32,9 @@ metadata:
   name: appscode:stash:view
   labels:
     rbac.authorization.k8s.io/aggregate-to-view: "true"
+  annotations:
+    "helm.sh/hook": post-install,post-upgrade
+    "helm.sh/hook-delete-policy": before-hook-creation
 rules:
 - apiGroups:
   - stash.appscode.com

diff --git a/chart/stash/templates/validating-webhook.yaml b/chart/stash/templates/validating-webhook.yaml
@@ -10,7 +10,7 @@ metadata:
     release: "{{ .Release.Name }}"
   annotations:
     "helm.sh/hook": post-install,post-upgrade
-    "helm.sh/hook-delete-policy": hook-succeeded
+    "helm.sh/hook-delete-policy": before-hook-creation
 webhooks:
 - name: restic.admission.stash.appscode.com
   clientConfig: